cleanup asm/scatterlist.h includes
Subsystems (15)
PATCH 1/1 cleanup asm/scatterlist.h includes
Not architecture specific code should not #include <asm/scatterlist.h>.
This patch therefore either replaces them with
#include <linux/scatterlist.h> or simply removes them if they were unused.
Signed-off-by Adrian Bunk <[email protected]>
---
crypto/anubis.c | 1 - crypto/blowfish.c | 1 - crypto/compress.c | 1 - crypto/crypto_null.c | 1 - crypto/khazad.c | 1 - crypto/sha1_generic.c | 1 - crypto/sha256_generic.c | 1 - crypto/sha512.c | 1 - crypto/tea.c | 1 - crypto/tgr192.c | 1 - crypto/wp512.c | 1 - drivers/base/dmapool.c | 1 - drivers/ieee1394/sbp2.c | 2 +- drivers/media/video/bt8xx/bttvp.h | 2 +- drivers/mmc/core/core.c | 1 - drivers/mmc/core/mmc_ops.c | 1 - drivers/mmc/core/sd_ops.c | 1 - drivers/mmc/core/sdio_ops.c | 1 - drivers/net/meth.c | 1 - drivers/usb/core/buffer.c | 1 - drivers/usb/core/hcd.c | 1 - drivers/usb/core/usb.c | 2 +- fs/nfsd/nfs4recover.c | 2 +- include/net/esp.h | 2 +- include/rdma/ib_verbs.h | 2 +- include/scsi/libsas.h | 2 +- net/ieee80211/ieee80211_crypt_ccmp.c | 1 - net/ipv4/ah4.c | 1 - net/ipv4/ipcomp.c | 1 - net/ipv6/ah6.c | 1 - net/ipv6/ipcomp6.c | 1 - net/mac80211/aes_ccm.c | 1 - net/sunrpc/auth_gss/gss_krb5_seal.c | 1 - net/sunrpc/auth_gss/gss_krb5_wrap.c | 1 - net/xfrm/xfrm_algo.c | 1 - 35 files changed, 7 insertions(+), 35 deletions(-)
9b30a07b8412fa3ba8d4c20f9e1d2e5c398e0e1f
crypto/anubis.c +0 -1
@@ -33,7 +33,6 @@#include <linux/module.h> #include <linux/mm.h> #include <asm/byteorder.h> -#include <asm/scatterlist.h> #include <linux/crypto.h> #include <linux/types.h>
crypto/blowfish.c +0 -1
@@ -20,7 +20,6 @@#include <linux/module.h> #include <linux/mm.h> #include <asm/byteorder.h> -#include <asm/scatterlist.h> #include <linux/crypto.h> #include <linux/types.h>
crypto/compress.c +0 -1
@@ -14,7 +14,6 @@#include <linux/types.h> #include <linux/crypto.h> #include <linux/errno.h> -#include <asm/scatterlist.h> #include <linux/string.h> #include "internal.h"
crypto/crypto_null.c +0 -1
@@ -19,7 +19,6 @@#include <linux/init.h> #include <linux/module.h> #include <linux/mm.h> -#include <asm/scatterlist.h> #include <linux/crypto.h> #include <linux/string.h>
crypto/khazad.c +0 -1
@@ -23,7 +23,6 @@#include <linux/module.h> #include <linux/mm.h> #include <asm/byteorder.h> -#include <asm/scatterlist.h> #include <linux/crypto.h> #include <linux/types.h>
crypto/sha1_generic.c +0 -1
@@ -23,7 +23,6 @@#include <linux/cryptohash.h> #include <linux/types.h> #include <crypto/sha.h> -#include <asm/scatterlist.h> #include <asm/byteorder.h> struct sha1_ctx {
crypto/sha256_generic.c +0 -1
@@ -22,7 +22,6 @@#include <linux/crypto.h> #include <linux/types.h> #include <crypto/sha.h> -#include <asm/scatterlist.h> #include <asm/byteorder.h> struct sha256_ctx {
crypto/sha512.c +0 -1
@@ -19,7 +19,6 @@#include <linux/types.h> #include <crypto/sha.h> -#include <asm/scatterlist.h> #include <asm/byteorder.h> struct sha512_ctx {
crypto/tea.c +0 -1
@@ -23,7 +23,6 @@#include <linux/module.h> #include <linux/mm.h> #include <asm/byteorder.h> -#include <asm/scatterlist.h> #include <linux/crypto.h> #include <linux/types.h>
crypto/tgr192.c +0 -1
@@ -25,7 +25,6 @@#include <linux/module.h> #include <linux/mm.h> #include <asm/byteorder.h> -#include <asm/scatterlist.h> #include <linux/crypto.h> #include <linux/types.h>
crypto/wp512.c +0 -1
@@ -23,7 +23,6 @@#include <linux/module.h> #include <linux/mm.h> #include <asm/byteorder.h> -#include <asm/scatterlist.h> #include <linux/crypto.h> #include <linux/types.h>
drivers/base/dmapool.c +0 -1
@@ -2,7 +2,6 @@#include <linux/device.h> #include <linux/mm.h> #include <asm/io.h> /* Needed for i386 to build */ -#include <asm/scatterlist.h> /* Needed for i386 to build */ #include <linux/dma-mapping.h> #include <linux/dmapool.h> #include <linux/slab.h>
drivers/ieee1394/sbp2.c +1 -1
@@ -71,11 +71,11 @@#include <linux/types.h> #include <linux/wait.h> #include <linux/workqueue.h> +#include <linux/scatterlist.h> #include <asm/byteorder.h> #include <asm/errno.h> #include <asm/param.h> -#include <asm/scatterlist.h> #include <asm/system.h> #include <asm/types.h>
drivers/media/video/bt8xx/bttvp.h +1 -1
@@ -36,7 +36,7 @@#include <linux/pci.h> #include <linux/input.h> #include <linux/mutex.h> -#include <asm/scatterlist.h> +#include <linux/scatterlist.h> #include <asm/io.h> #include <media/v4l2-common.h>
drivers/mmc/core/core.c +0 -1
@@ -19,7 +19,6 @@#include <linux/pagemap.h> #include <linux/err.h> #include <linux/leds.h> -#include <asm/scatterlist.h> #include <linux/scatterlist.h> #include <linux/mmc/card.h>
drivers/mmc/core/mmc_ops.c +0 -1
@@ -10,7 +10,6 @@*/ #include <linux/types.h> -#include <asm/scatterlist.h> #include <linux/scatterlist.h> #include <linux/mmc/host.h>
drivers/mmc/core/sd_ops.c +0 -1
@@ -10,7 +10,6 @@*/ #include <linux/types.h> -#include <asm/scatterlist.h> #include <linux/scatterlist.h> #include <linux/mmc/host.h>
drivers/mmc/core/sdio_ops.c +0 -1
@@ -9,7 +9,6 @@* your option) any later version. */ -#include <asm/scatterlist.h> #include <linux/scatterlist.h> #include <linux/mmc/host.h>
drivers/net/meth.c +0 -1
@@ -33,7 +33,6 @@#include <asm/ip32/ip32_ints.h> #include <asm/io.h> -#include <asm/scatterlist.h> #include "meth.h"
drivers/usb/core/buffer.c +0 -1
@@ -11,7 +11,6 @@#include <linux/device.h> #include <linux/mm.h> #include <asm/io.h> -#include <asm/scatterlist.h> #include <linux/dma-mapping.h> #include <linux/dmapool.h> #include <linux/usb.h>
drivers/usb/core/hcd.c +0 -1
@@ -30,7 +30,6 @@#include <linux/utsname.h> #include <linux/mm.h> #include <asm/io.h> -#include <asm/scatterlist.h> #include <linux/device.h> #include <linux/dma-mapping.h> #include <linux/mutex.h>
drivers/usb/core/usb.c +1 -1
@@ -36,7 +36,7 @@#include <linux/workqueue.h> #include <asm/io.h> -#include <asm/scatterlist.h> +#include <linux/scatterlist.h> #include <linux/mm.h> #include <linux/dma-mapping.h>
fs/nfsd/nfs4recover.c +1 -1
@@ -43,7 +43,7 @@#include <linux/file.h> #include <linux/namei.h> #include <asm/uaccess.h> -#include <asm/scatterlist.h> +#include <linux/scatterlist.h> #include <linux/crypto.h> #include <linux/sched.h>
include/net/esp.h +1 -1
@@ -3,7 +3,7 @@#include <linux/crypto.h> #include <net/xfrm.h> -#include <asm/scatterlist.h> +#include <linux/scatterlist.h> #define ESP_NUM_FAST_SG 4
include/rdma/ib_verbs.h +1 -1
@@ -48,9 +48,9 @@#include <linux/kref.h> #include <linux/list.h> #include <linux/rwsem.h> +#include <linux/scatterlist.h> #include <asm/atomic.h> -#include <asm/scatterlist.h> #include <asm/uaccess.h> union ib_gid {
include/scsi/libsas.h +1 -1
@@ -36,7 +36,7 @@#include <scsi/scsi_device.h> #include <scsi/scsi_cmnd.h> #include <scsi/scsi_transport_sas.h> -#include <asm/scatterlist.h> +#include <linux/scatterlist.h> struct block_device ;
net/ieee80211/ieee80211_crypt_ccmp.c +0 -1
@@ -25,7 +25,6 @@#include <net/ieee80211.h> #include <linux/crypto.h> -#include <asm/scatterlist.h> MODULE_AUTHOR ("Jouni Malinen" );MODULE_DESCRIPTION ("Host AP crypt: CCMP" );
net/ipv4/ah4.c +0 -1
@@ -8,7 +8,6 @@#include <linux/spinlock.h> #include <net/icmp.h> #include <net/protocol.h> -#include <asm/scatterlist.h> /* Clear mutable options and find final destination to substitute
net/ipv4/ipcomp.c +0 -1
@@ -14,7 +14,6 @@* - Adaptive compression. */ #include <linux/module.h> -#include <asm/scatterlist.h> #include <asm/semaphore.h> #include <linux/crypto.h> #include <linux/pfkeyv2.h>
net/ipv6/ah6.c +0 -1
@@ -35,7 +35,6 @@#include <net/ipv6.h> #include <net/protocol.h> #include <net/xfrm.h> -#include <asm/scatterlist.h> static int zero_out_mutable_opts (struct ipv6_opt_hdr *opthdr) {
net/ipv6/ipcomp6.c +0 -1
@@ -34,7 +34,6 @@#include <net/ip.h> #include <net/xfrm.h> #include <net/ipcomp.h> -#include <asm/scatterlist.h> #include <asm/semaphore.h> #include <linux/crypto.h> #include <linux/pfkeyv2.h>
net/mac80211/aes_ccm.c +0 -1
@@ -11,7 +11,6 @@#include <linux/types.h> #include <linux/crypto.h> #include <linux/err.h> -#include <asm/scatterlist.h> #include <net/mac80211.h> #include "ieee80211_key.h"
net/sunrpc/auth_gss/gss_krb5_seal.c +0 -1
@@ -63,7 +63,6 @@#include <linux/jiffies.h> #include <linux/sunrpc/gss_krb5.h> #include <linux/random.h> -#include <asm/scatterlist.h> #include <linux/crypto.h> #ifdef RPC_DEBUG
net/sunrpc/auth_gss/gss_krb5_wrap.c +0 -1
@@ -4,7 +4,6 @@#include <linux/sunrpc/gss_krb5.h> #include <linux/random.h> #include <linux/pagemap.h> -#include <asm/scatterlist.h> #include <linux/crypto.h> #ifdef RPC_DEBUG
net/xfrm/xfrm_algo.c +0 -1
@@ -21,7 +21,6 @@#if defined(CONFIG_INET_ESP ) || defined(CONFIG_INET_ESP_MODULE ) || defined(CONFIG_INET6_ESP ) || defined(CONFIG_INET6_ESP_MODULE )#include <net/esp.h> #endif -#include <asm/scatterlist.h> /* * Algorithms supported by IPsec. These entries contain properties which
Quoted 5 lines · Adrian Bunk
Not architecture specific code should not #include <
asm/scatterlist.h>.This patch therefore either replaces them with
#include <linux/scatterlist.h> or simply removes them if they were unused.
Looks fine to me - what did you compile test this on?
Signature · 1 line
Jens Axboe
Quoted 8 lines · Jens Axboe
Quoted 5 lines · Adrian Bunk
Not architecture specific code should not #include <
asm/scatterlist.h>.This patch therefore either replaces them with
#include <linux/scatterlist.h> or simply removes them if they were unused.Looks fine to me - what did you compile test this on?
i386 all static and all modular configs (slightly different from but similar to allyesconfig+allmodconfig) and defconfigs of 24 architectures (but some of them fail to compile due to different problems).
Quoted 1 line
Jens Axboe
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon SeedQuoted 8 lines · Adrian Bunk
Quoted 7 lines · Jens Axboe
Quoted 5 lines · Adrian Bunk
Not architecture specific code should not #include <
asm/scatterlist.h>.This patch therefore either replaces them with
#include <linux/scatterlist.h> or simply removes them if they were unused.
Quoted 6 lines
Quoted 1 line
Looks fine to me - what did you compile test this on?
i386 all static and all modular configs (slightly different from but similar to allyesconfig+allmodconfig) and defconfigs of 24 architectures (but some of them fail to compile due to different problems).
Good, applied!
Signature · 1 line
Jens Axboe