Re: [PATCH 03/14] vfio/mdev: make mdev.h standalone includable

Anthony Krowiak <akrowiak@xxxxxxxxxxxxx> · Tue, 23 Aug 2022 11:15:14 -0400

Reviewed-by: Tony Krowiak <akrowiak@xxxxxxxxxxxxx>

On 8/22/22 2:21 AM, Christoph Hellwig wrote:
Include <linux/device.h> and <linux/uuid.h> so that users of this headers
don't need to do that and remove those includes that aren't needed
any more.

Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Reviewed-by: Jason Gunthorpe <jgg@xxxxxxxxxx>
Reviewed-by: Kevin Tian <kevin.tian@xxxxxxxxx>
Reviewed By: Kirti Wankhede <kwankhede@xxxxxxxxxx>
---
  drivers/gpu/drm/i915/gvt/kvmgt.c      | 2 --
  drivers/s390/cio/vfio_ccw_drv.c       | 1 -
  drivers/s390/crypto/vfio_ap_private.h | 1 -
  drivers/vfio/mdev/mdev_core.c         | 2 --
  drivers/vfio/mdev/mdev_driver.c       | 1 -
  drivers/vfio/mdev/mdev_sysfs.c        | 2 --
  include/linux/mdev.h                  | 3 +++
  samples/vfio-mdev/mbochs.c            | 1 -
  samples/vfio-mdev/mdpy.c              | 1 -
  samples/vfio-mdev/mtty.c              | 2 --
  10 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
index 91ba675a2fb8c..92bb9e7548b12 100644
--- a/drivers/gpu/drm/i915/gvt/kvmgt.c
+++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
@@ -34,7 +34,6 @@
   */
  
  #include <linux/init.h>
-#include <linux/device.h>
  #include <linux/mm.h>
  #include <linux/kthread.h>
  #include <linux/sched/mm.h>
@@ -43,7 +42,6 @@
  #include <linux/rbtree.h>
  #include <linux/spinlock.h>
  #include <linux/eventfd.h>
-#include <linux/uuid.h>
  #include <linux/mdev.h>
  #include <linux/debugfs.h>
  
diff --git a/drivers/s390/cio/vfio_ccw_drv.c b/drivers/s390/cio/vfio_ccw_drv.c
index 86d9e428357b0..e9985c63dc6bf 100644
--- a/drivers/s390/cio/vfio_ccw_drv.c
+++ b/drivers/s390/cio/vfio_ccw_drv.c
@@ -12,7 +12,6 @@
  
  #include <linux/module.h>
  #include <linux/init.h>
-#include <linux/device.h>
  #include <linux/slab.h>
  #include <linux/mdev.h>
  
diff --git a/drivers/s390/crypto/vfio_ap_private.h b/drivers/s390/crypto/vfio_ap_private.h
index d782cf463eaba..163eeaaf24cee 100644
--- a/drivers/s390/crypto/vfio_ap_private.h
+++ b/drivers/s390/crypto/vfio_ap_private.h
@@ -13,7 +13,6 @@
  #define _VFIO_AP_PRIVATE_H_
  
  #include <linux/types.h>
-#include <linux/device.h>
  #include <linux/mdev.h>
  #include <linux/delay.h>
  #include <linux/mutex.h>
diff --git a/drivers/vfio/mdev/mdev_core.c b/drivers/vfio/mdev/mdev_core.c
index b8b9e7911e559..2c32923fbad27 100644
--- a/drivers/vfio/mdev/mdev_core.c
+++ b/drivers/vfio/mdev/mdev_core.c
@@ -8,9 +8,7 @@
   */
  
  #include <linux/module.h>
-#include <linux/device.h>
  #include <linux/slab.h>
-#include <linux/uuid.h>
  #include <linux/sysfs.h>
  #include <linux/mdev.h>
  
diff --git a/drivers/vfio/mdev/mdev_driver.c b/drivers/vfio/mdev/mdev_driver.c
index 9c2af59809e2e..7bd4bb9850e81 100644
--- a/drivers/vfio/mdev/mdev_driver.c
+++ b/drivers/vfio/mdev/mdev_driver.c
@@ -7,7 +7,6 @@
   *             Kirti Wankhede <kwankhede@xxxxxxxxxx>
   */
  
-#include <linux/device.h>
  #include <linux/iommu.h>
  #include <linux/mdev.h>
  
diff --git a/drivers/vfio/mdev/mdev_sysfs.c b/drivers/vfio/mdev/mdev_sysfs.c
index 0ccfeb3dda245..4bfbf49aaa66a 100644
--- a/drivers/vfio/mdev/mdev_sysfs.c
+++ b/drivers/vfio/mdev/mdev_sysfs.c
@@ -9,9 +9,7 @@
  
  #include <linux/sysfs.h>
  #include <linux/ctype.h>
-#include <linux/device.h>
  #include <linux/slab.h>
-#include <linux/uuid.h>
  #include <linux/mdev.h>
  
  #include "mdev_private.h"
diff --git a/include/linux/mdev.h b/include/linux/mdev.h
index 47ad3b104d9e7..a5d8ae6132a20 100644
--- a/include/linux/mdev.h
+++ b/include/linux/mdev.h
@@ -10,6 +10,9 @@
  #ifndef MDEV_H
  #define MDEV_H
  
+#include <linux/device.h>
+#include <linux/uuid.h>
+
  struct mdev_type;
  
  struct mdev_device {
diff --git a/samples/vfio-mdev/mbochs.c b/samples/vfio-mdev/mbochs.c
index 344c2901a82bf..d0d1bb7747240 100644
--- a/samples/vfio-mdev/mbochs.c
+++ b/samples/vfio-mdev/mbochs.c
@@ -21,7 +21,6 @@
   */
  #include <linux/init.h>
  #include <linux/module.h>
-#include <linux/device.h>
  #include <linux/kernel.h>
  #include <linux/slab.h>
  #include <linux/vmalloc.h>
diff --git a/samples/vfio-mdev/mdpy.c b/samples/vfio-mdev/mdpy.c
index e8c46eb2e2468..0c4ca1f4be7ed 100644
--- a/samples/vfio-mdev/mdpy.c
+++ b/samples/vfio-mdev/mdpy.c
@@ -17,7 +17,6 @@
   */
  #include <linux/init.h>
  #include <linux/module.h>
-#include <linux/device.h>
  #include <linux/kernel.h>
  #include <linux/slab.h>
  #include <linux/vmalloc.h>
diff --git a/samples/vfio-mdev/mtty.c b/samples/vfio-mdev/mtty.c
index f42a59ed2e3fe..4f5a6f2d3629d 100644
--- a/samples/vfio-mdev/mtty.c
+++ b/samples/vfio-mdev/mtty.c
@@ -12,7 +12,6 @@
  
  #include <linux/init.h>
  #include <linux/module.h>
-#include <linux/device.h>
  #include <linux/kernel.h>
  #include <linux/fs.h>
  #include <linux/poll.h>
@@ -20,7 +19,6 @@
  #include <linux/cdev.h>
  #include <linux/sched.h>
  #include <linux/wait.h>
-#include <linux/uuid.h>
  #include <linux/vfio.h>
  #include <linux/iommu.h>
  #include <linux/sysfs.h>






