[PATCH v2 02/18] get rid of asm/checksum.h includes outside of include/net/checksum.h and arch

From: Al Viro
Date: Mon Dec 04 2023 - 21:25:03 EST


in almost all cases include is redundant; zcore.c and checksum_kunit.c are the sole
exceptions and those got switched to net/checksum.h

Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
---
drivers/net/ethernet/brocade/bna/bnad.h | 2 --
drivers/net/ethernet/lantiq_etop.c | 2 --
drivers/net/vmxnet3/vmxnet3_int.h | 1 -
drivers/s390/char/zcore.c | 2 +-
include/net/ip6_checksum.h | 1 -
lib/checksum_kunit.c | 2 +-
net/ipv6/ip6_checksum.c | 1 -
7 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/drivers/net/ethernet/brocade/bna/bnad.h b/drivers/net/ethernet/brocade/bna/bnad.h
index 10b1e534030e..0842a276dcf4 100644
--- a/drivers/net/ethernet/brocade/bna/bnad.h
+++ b/drivers/net/ethernet/brocade/bna/bnad.h
@@ -18,8 +18,6 @@
#include <linux/mutex.h>
#include <linux/firmware.h>
#include <linux/if_vlan.h>
-
-#include <asm/checksum.h>
#include <net/ip6_checksum.h>

#include <net/ip.h>
diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c
index 1d5b7bb6380f..f95bdb42b25f 100644
--- a/drivers/net/ethernet/lantiq_etop.c
+++ b/drivers/net/ethernet/lantiq_etop.c
@@ -27,8 +27,6 @@
#include <linux/module.h>
#include <linux/property.h>

-#include <asm/checksum.h>
-
#include <lantiq_soc.h>
#include <xway_dma.h>
#include <lantiq_platform.h>
diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h
index 915aaf18c409..bef4cd73f06d 100644
--- a/drivers/net/vmxnet3/vmxnet3_int.h
+++ b/drivers/net/vmxnet3/vmxnet3_int.h
@@ -51,7 +51,6 @@
#include <linux/ipv6.h>
#include <linux/in.h>
#include <linux/etherdevice.h>
-#include <asm/checksum.h>
#include <linux/if_vlan.h>
#include <linux/if_arp.h>
#include <linux/inetdevice.h>
diff --git a/drivers/s390/char/zcore.c b/drivers/s390/char/zcore.c
index bc3be0330f1d..040b92ecaeab 100644
--- a/drivers/s390/char/zcore.c
+++ b/drivers/s390/char/zcore.c
@@ -18,6 +18,7 @@
#include <linux/panic_notifier.h>
#include <linux/reboot.h>
#include <linux/uio.h>
+#include <net/checksum.h>

#include <asm/asm-offsets.h>
#include <asm/ipl.h>
@@ -27,7 +28,6 @@
#include <asm/debug.h>
#include <asm/processor.h>
#include <asm/irqflags.h>
-#include <asm/checksum.h>
#include <asm/os_info.h>
#include <asm/switch_to.h>
#include <asm/maccess.h>
diff --git a/include/net/ip6_checksum.h b/include/net/ip6_checksum.h
index c8a96b888277..6cc775357230 100644
--- a/include/net/ip6_checksum.h
+++ b/include/net/ip6_checksum.h
@@ -25,7 +25,6 @@
#include <asm/types.h>
#include <asm/byteorder.h>
#include <net/ip.h>
-#include <asm/checksum.h>
#include <linux/in6.h>
#include <linux/tcp.h>
#include <linux/ipv6.h>
diff --git a/lib/checksum_kunit.c b/lib/checksum_kunit.c
index 0eed92b77ba3..971e7824893b 100644
--- a/lib/checksum_kunit.c
+++ b/lib/checksum_kunit.c
@@ -4,7 +4,7 @@
*/

#include <kunit/test.h>
-#include <asm/checksum.h>
+#include <net/checksum.h>

#define MAX_LEN 512
#define MAX_ALIGN 64
diff --git a/net/ipv6/ip6_checksum.c b/net/ipv6/ip6_checksum.c
index 377717045f8f..7868163b8a24 100644
--- a/net/ipv6/ip6_checksum.c
+++ b/net/ipv6/ip6_checksum.c
@@ -2,7 +2,6 @@
#include <net/ip.h>
#include <net/udp.h>
#include <net/udplite.h>
-#include <asm/checksum.h>

#ifndef _HAVE_ARCH_IPV6_CSUM
__sum16 csum_ipv6_magic(const struct in6_addr *saddr,
--
2.39.2