From 3ba56d6b232f7dcbf00552af48355f0dc2d26994 Mon Sep 17 00:00:00 2001 From: Tom Rini <trini@konsulko.com> Date: Wed, 1 May 2024 19:31:32 -0600 Subject: [PATCH] virtio: Remove <common.h> and add needed includes Remove <common.h> from this driver directory and when needed add missing include files directly. Signed-off-by: Tom Rini <trini@konsulko.com> --- drivers/virtio/virtio-uclass.c | 1 - drivers/virtio/virtio_blk.c | 1 - drivers/virtio/virtio_mmio.c | 1 - drivers/virtio/virtio_net.c | 1 - drivers/virtio/virtio_pci_legacy.c | 1 - drivers/virtio/virtio_pci_modern.c | 1 - drivers/virtio/virtio_ring.c | 1 - drivers/virtio/virtio_rng.c | 1 - drivers/virtio/virtio_sandbox.c | 1 - include/virtio.h | 1 + 10 files changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/virtio/virtio-uclass.c b/drivers/virtio/virtio-uclass.c index c542016273..1dbc1a56aa 100644 --- a/drivers/virtio/virtio-uclass.c +++ b/drivers/virtio/virtio-uclass.c @@ -17,7 +17,6 @@ #define LOG_CATEGORY UCLASS_VIRTIO -#include <common.h> #include <bootdev.h> #include <dm.h> #include <log.h> diff --git a/drivers/virtio/virtio_blk.c b/drivers/virtio/virtio_blk.c index 9581058286..3404f61eba 100644 --- a/drivers/virtio/virtio_blk.c +++ b/drivers/virtio/virtio_blk.c @@ -6,7 +6,6 @@ #define LOG_CATEGORY UCLASS_VIRTIO -#include <common.h> #include <blk.h> #include <dm.h> #include <part.h> diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c index 78c15c821b..1cd737aca2 100644 --- a/drivers/virtio/virtio_mmio.c +++ b/drivers/virtio/virtio_mmio.c @@ -7,7 +7,6 @@ * Ported from Linux drivers/virtio/virtio_mmio.c */ -#include <common.h> #include <dm.h> #include <log.h> #include <virtio_types.h> diff --git a/drivers/virtio/virtio_net.c b/drivers/virtio/virtio_net.c index 1794f73a8d..0e5367a085 100644 --- a/drivers/virtio/virtio_net.c +++ b/drivers/virtio/virtio_net.c @@ -4,7 +4,6 @@ * Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com> */ -#include <common.h> #include <dm.h> #include <net.h> #include <virtio_types.h> diff --git a/drivers/virtio/virtio_pci_legacy.c b/drivers/virtio/virtio_pci_legacy.c index aa89604ae8..15f8c6e7d2 100644 --- a/drivers/virtio/virtio_pci_legacy.c +++ b/drivers/virtio/virtio_pci_legacy.c @@ -6,7 +6,6 @@ * Ported from Linux drivers/virtio/virtio_pci*.c */ -#include <common.h> #include <dm.h> #include <log.h> #include <virtio_types.h> diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c index 3cdc2d2d6f..5850e0c18c 100644 --- a/drivers/virtio/virtio_pci_modern.c +++ b/drivers/virtio/virtio_pci_modern.c @@ -6,7 +6,6 @@ * Ported from Linux drivers/virtio/virtio_pci*.c */ -#include <common.h> #include <dm.h> #include <log.h> #include <virtio_types.h> diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index c9adcce5c0..306fa5b3f6 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -7,7 +7,6 @@ */ #include <bouncebuf.h> -#include <common.h> #include <dm.h> #include <log.h> #include <malloc.h> diff --git a/drivers/virtio/virtio_rng.c b/drivers/virtio/virtio_rng.c index 786359a6e3..90a371a59c 100644 --- a/drivers/virtio/virtio_rng.c +++ b/drivers/virtio/virtio_rng.c @@ -3,7 +3,6 @@ * Copyright (c) 2019, Linaro Limited */ -#include <common.h> #include <dm.h> #include <log.h> #include <rng.h> diff --git a/drivers/virtio/virtio_sandbox.c b/drivers/virtio/virtio_sandbox.c index b34f1d6045..0f1ebef22e 100644 --- a/drivers/virtio/virtio_sandbox.c +++ b/drivers/virtio/virtio_sandbox.c @@ -5,7 +5,6 @@ * VirtIO Sandbox transport driver, for testing purpose only */ -#include <common.h> #include <dm.h> #include <virtio_types.h> #include <virtio.h> diff --git a/include/virtio.h b/include/virtio.h index 062a24630c..1ab0ec5f39 100644 --- a/include/virtio.h +++ b/include/virtio.h @@ -23,6 +23,7 @@ #include <virtio_types.h> #include <linux/bitops.h> #include <linux/bug.h> +#include <linux/typecheck.h> #define VIRTIO_ID_NET 1 /* virtio net */ #define VIRTIO_ID_BLOCK 2 /* virtio block */ #define VIRTIO_ID_RNG 4 /* virtio rng */ -- 2.39.5