Skip to contentSkip to conversation

kfifo: Clean up kfifo.h

PATCH New Andy Shevchenko 1 participant 4 messages Apr 23, 2024

Subsystems (11)
lore
Share & tools
lore
#1 lore raw

PATCH v2 1/3 media: rc: Add missing io.h

In reply to Andy Shevchenko

In many remote control drivers the io.h is implied by others. This is not good as it prevents from cleanups done in other headers. Add missing include.

---
 drivers/media/rc/mtk-cir.c   | 1 +
 drivers/media/rc/serial_ir.c | 1 +
 drivers/media/rc/st_rc.c     | 1 +
 drivers/media/rc/sunxi-cir.c | 1 +
 4 files changed, 4 insertions(+)
drivers/media/rc/mtk-cir.c +1 -0
index 4e294e59d3cb..b2f82b2d1c8d 100644
@@ -8,6 +8,7 @@
 #include <linux/clk.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
+#include <linux/io.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/reset.h>
drivers/media/rc/serial_ir.c +1 -0
index 96ae0294ac10..fc5fd3927177 100644
@@ -18,6 +18,7 @@
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/interrupt.h>
+#include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/serial_reg.h>
 #include <linux/types.h>
drivers/media/rc/st_rc.c +1 -0
index 28477aa95563..988b09191c4c 100644
@@ -6,6 +6,7 @@
 #include <linux/kernel.h>
 #include <linux/clk.h>
 #include <linux/interrupt.h>
+#include <linux/io.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
drivers/media/rc/sunxi-cir.c +1 -0
index bf58c965ead8..b49df8355e6b 100644
@@ -12,6 +12,7 @@
 
 #include <linux/clk.h>
 #include <linux/interrupt.h>
+#include <linux/io.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
#0 lore raw

v2 cover kfifo: Clean up kfifo.h

To reduce a dependency hell degree, clean up kfifo.h (mainly getting rid of kernel.h in the global header).

In v2:
- rebased on top of v6.9-rc5 (Andrew)
- retested again with make allyesconfig on x86_64, hence first two new patches

Andy Shevchenko (3):
media: rc: Add missing io.h
media: stih-cec: Add missing io.h
kfifo: Don't use "proxy" headers

 drivers/media/cec/platform/sti/stih-cec.c |  1 +
 drivers/media/rc/mtk-cir.c                |  1 +
 drivers/media/rc/serial_ir.c              |  1 +
 drivers/media/rc/st_rc.c                  |  1 +
 drivers/media/rc/sunxi-cir.c              |  1 +
 include/linux/kfifo.h                     |  9 +++++++--
 lib/kfifo.c                               | 10 +++++-----
 samples/kfifo/dma-example.c               |  3 ++-
 8 files changed, 19 insertions(+), 8 deletions(-)
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
#3 lore raw

PATCH v2 3/3 kfifo: Don't use "proxy" headers

Update header inclusions to follow IWYU (Include What You Use) principle.

---
 include/linux/kfifo.h       |  9 +++++++--
 lib/kfifo.c                 | 10 +++++-----
 samples/kfifo/dma-example.c |  3 ++-
 3 files changed, 14 insertions(+), 8 deletions(-)
include/linux/kfifo.h +7 -2
index 0b35a41440ff..6b28d642f332 100644
@@ -36,10 +36,15 @@
  * to lock the reader.
  */
 
-#include <linux/kernel.h>
+#include <linux/array_size.h>
 #include <linux/spinlock.h>
 #include <linux/stddef.h>
-#include <linux/scatterlist.h>
+#include <linux/types.h>
+
+#include <asm/barrier.h>
+#include <asm/errno.h>
+
+struct scatterlist;
 
 struct __kfifo {
 	unsigned int	in;
lib/kfifo.c +5 -5
index 12f5a347aa13..15acdee4a8f3 100644
@@ -5,13 +5,13 @@
  * Copyright (C) 2009/2010 Stefani Seibold <[email protected]>
  */
 
-#include <linux/kernel.h>
-#include <linux/export.h>
-#include <linux/slab.h>
 #include <linux/err.h>
-#include <linux/log2.h>
-#include <linux/uaccess.h>
+#include <linux/export.h>
 #include <linux/kfifo.h>
+#include <linux/log2.h>
+#include <linux/scatterlist.h>
+#include <linux/slab.h>
+#include <linux/uaccess.h>
 
 /*
  * internal helper to calculate the unused elements in a fifo
samples/kfifo/dma-example.c +2 -1
index 0cf27483cb36..74fe915b7ffe 100644
@@ -6,8 +6,9 @@
  */
 
 #include <linux/init.h>
-#include <linux/module.h>
 #include <linux/kfifo.h>
+#include <linux/module.h>
+#include <linux/scatterlist.h>
 
 /*
  * This module shows how to handle fifo dma operations.
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
#2 lore raw

PATCH v2 2/3 media: stih-cec: Add missing io.h

In reply to Andy Shevchenko

In the driver the io.h is implied by others. This is not good as it prevents from cleanups done in other headers. Add missing include.

---
 drivers/media/cec/platform/sti/stih-cec.c | 1 +
 1 file changed, 1 insertion(+)
drivers/media/cec/platform/sti/stih-cec.c +1 -0
index a20fc5c0c88d..99978a7c8d9b 100644
@@ -6,6 +6,7 @@
  */
 #include <linux/clk.h>
 #include <linux/interrupt.h>
+#include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/mfd/syscon.h>
 #include <linux/module.h>
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac