Skip to contentSkip to conversation

Clean up duplicate includes

PATCH Applied Jesper Juhl 2 participants 6 messages Jul 21, 2007 – Jul 22, 2007

Subsystems (8)
Networking Network drivers netfilter NFS client +4 more subsystems
lore
Share & tools
lore

Jesper Juhl

author
#0 lore raw

cover Clean up duplicate includes

Greetings,

This is a series of patches to clean up the vast majority of duplicate includes in the source tree. There are still a few offenders left after these patches, but this takes care of the vast majority.

I've split the patches by directory in the hope that each patch will then hit the area of responsability of a single person, or at most a few.
I've tried to Cc the appropriate people and mailing lists for each patch, but without a doubt I'll have sent some of the patches to the wrong people and omitted some people that should have been on the Cc list. I hope that if someone doesn't get a patch directly, they can still notice it from this mail and pick it up from LKML (or just ask me to send it).

These are the patches in this series :

[PATCH][01/37] Clean up duplicate includes in Documentation/ [PATCH][02/37] Clean up duplicate includes in arch/i386/kernel/ [PATCH][03/37] Clean up duplicate includes in arch/i386/xen/ [PATCH][04/37] Clean up duplicate includes in drivers/atm/ [PATCH][05/37] Clean up duplicate includes in drivers/block/ [PATCH][06/37] Clean up duplicate includes in drivers/char/ [PATCH][07/37] Clean up duplicate includes in drivers/hwmon/ [PATCH][08/37] Clean up duplicate includes in drivers/input/ [PATCH][09/37] Clean up duplicate includes in drivers/macintosh/ [PATCH][10/37] Clean up duplicate includes in drivers/media/ [PATCH][11/37] Clean up duplicate includes in drivers/mtd/ [PATCH][12/37] Clean up duplicate includes in drivers/net/ [PATCH][13/37] Clean up duplicate includes in drivers/scsi/ [PATCH][14/37] Clean up duplicate includes in drivers/spi/ [PATCH][15/37] Clean up duplicate includes in drivers/usb/ [PATCH][16/37] Clean up duplicate includes in drivers/w1/ [PATCH][17/37] Clean up duplicate includes in fs/
[PATCH][18/37] Clean up duplicate includes in fs/ecryptfs/ [PATCH][19/37] Clean up duplicate includes in fs/gfs2/ [PATCH][20/37] Clean up duplicate includes in fs/ntfs/ [PATCH][21/37] Clean up duplicate includes in include/media/ [PATCH][22/37] Clean up duplicate includes in include/linux/memory_hotplug.h [PATCH][23/37] Clean up duplicate includes in include/linux/nfs_fs.h [PATCH][24/37] Clean up duplicate includes in kernel/ [PATCH][25/37] Clean up duplicate includes in mm/
[PATCH][26/37] Clean up duplicate includes in net/atm/ [PATCH][27/37] Clean up duplicate includes in net/bridge/ [PATCH][28/37] Clean up duplicate includes in net/ipv4/ [PATCH][29/37] Clean up duplicate includes in net/ipv6/ [PATCH][30/37] Clean up duplicate includes in net/netfilter/ [PATCH][31/37] Clean up duplicate includes in net/sched/ [PATCH][32/37] Clean up duplicate includes in net/sunrpc/ [PATCH][33/37] Clean up duplicate includes in net/tipc/ [PATCH][34/37] Clean up duplicate includes in net/xfrm/ [PATCH][35/37] Clean up duplicate includes in sound/core/ [PATCH][36/37] Clean up duplicate includes in sound/ppc/ [PATCH][37/37] Clean up duplicate includes in sound/soc/

Please consider applying these patches.

Kind regards,
Jesper Juhl <[email protected]>

#1 lore raw
Quoted 2 lines · Jesper Juhl

[...]
These are the patches in this series :

Ok, I've reviewed all patches in this series except:

Quoted 3 lines

[PATCH][12/37] Clean up duplicate includes in drivers/net/ [PATCH][28/37] Clean up duplicate includes in net/ipv4/ [PATCH][32/37] Clean up duplicate includes in net/sunrpc/

which I did not find anywhere ... not even on netdev@

Anyway, the entire series was OK, just removing a #include line when that exact same header was already #include'd in the same file. [ I also wonder if this patchset ends up exposing some header-include-ordering problems that were previously hidden, actually. ]

Quoted 1 line

Please consider applying these patches.

I think these are trivial and obvious enough -- can probably be merged together into single patch by Andrew and just slammed into the kernel tree :-)

Thanks,
Satyam

author
#2 lore raw

Re: [00/37] Clean up duplicate includes (resend patch 12)

Quoted 10 lines · On Sunday 22 July 2007 04:30:41 Satyam Sharma wrote:
Quoted 2 lines · Jesper Juhl

[...]
These are the patches in this series :

Ok, I've reviewed all patches in this series except:

Quoted 3 lines

[PATCH][12/37] Clean up duplicate includes in drivers/net/ [PATCH][28/37] Clean up duplicate includes in net/ipv4/ [PATCH][32/37] Clean up duplicate includes in net/sunrpc/

Here's a resend of patch 12.

drivers/net/atl1/atl1_main.c +0 -1
index fd1e156..4a18b88 100644
@@ -75,7 +75,6 @@
 #include <linux/compiler.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
-#include <linux/interrupt.h>
 #include <net/checksum.h>
 
 #include <asm/atomic.h>
drivers/net/bfin_mac.c +0 -5
index 9a08d65..01281ee 100644
@@ -47,15 +47,10 @@
 #include <linux/spinlock.h>
 #include <linux/ethtool.h>
 #include <linux/mii.h>
-
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
-
 #include <linux/platform_device.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/skbuff.h>
 
 #include <asm/dma.h>
 #include <linux/dma-mapping.h>
drivers/net/bonding/bond_sysfs.c +0 -1
index 60cccf2..9afd172 100644
@@ -31,7 +31,6 @@
 #include <linux/inetdevice.h>
 #include <linux/in.h>
 #include <linux/sysfs.h>
-#include <linux/string.h>
 #include <linux/ctype.h>
 #include <linux/inet.h>
 #include <linux/rtnetlink.h>
drivers/net/fs_enet/fs_enet-main.c +0 -2
index a4a2a0e..27de3d8 100644
@@ -39,8 +39,6 @@
 
 #include <linux/vmalloc.h>
 #include <asm/pgtable.h>
-
-#include <asm/pgtable.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
drivers/net/gianfar.h +0 -1
index d8e779c..43c8668 100644
@@ -45,7 +45,6 @@
 #include <linux/crc32.h>
 #include <linux/workqueue.h>
 #include <linux/ethtool.h>
-#include <linux/netdevice.h>
 #include <linux/fsl_devices.h>
 #include "gianfar_mii.h"
drivers/net/gianfar_ethtool.c +0 -1
index 7b411c1..2470903 100644
@@ -34,7 +34,6 @@
 #include <linux/module.h>
 #include <linux/crc32.h>
 #include <asm/types.h>
-#include <asm/uaccess.h>
 #include <linux/ethtool.h>
 #include <linux/mii.h>
 #include <linux/phy.h>
drivers/net/irda/kingsun-sir.c +0 -1
index bdd5c97..4c0d379 100644
@@ -66,7 +66,6 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <linux/module.h>
 #include <linux/kref.h>
 #include <linux/usb.h>
 #include <linux/device.h>
drivers/net/irda/mcs7780.c +0 -1
index 0de8672..bfc5752 100644
@@ -50,7 +50,6 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <linux/module.h>
 #include <linux/kref.h>
 #include <linux/usb.h>
 #include <linux/device.h>
drivers/net/mipsnet.c +0 -1
index 9853c74..c0f5ad3 100644
@@ -11,7 +11,6 @@
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
-#include <linux/netdevice.h>
 #include <linux/platform_device.h>
 #include <asm/io.h>
 #include <asm/mips-boards/simint.h>
drivers/net/netxen/netxen_nic_main.c +0 -1
index b703ccf..6ba8e07 100644
@@ -39,7 +39,6 @@
 #include "netxen_nic_phan_reg.h"
 
 #include <linux/dma-mapping.h>
-#include <linux/vmalloc.h>
 #include <net/ip.h>
 
 MODULE_DESCRIPTION("NetXen Multi port (1/10) Gigabit Network Driver");
drivers/net/qla3xxx.c +0 -1
index 8be8be4..c2fc2f7 100755
@@ -31,7 +31,6 @@
 #include <linux/skbuff.h>
 #include <linux/rtnetlink.h>
 #include <linux/if_vlan.h>
-#include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/mm.h>
drivers/net/tsi108_eth.c +0 -1
index 1aabc91..a059f3d 100644
@@ -47,7 +47,6 @@
 #include <linux/rtnetlink.h>
 #include <linux/timer.h>
 #include <linux/platform_device.h>
-#include <linux/etherdevice.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
drivers/net/wireless/ipw2200.h +0 -1
index 626a240..9c973b9 100644
@@ -45,7 +45,6 @@
 
 #include <linux/firmware.h>
 #include <linux/wireless.h>
-#include <linux/dma-mapping.h>
 #include <linux/jiffies.h>
 #include <asm/io.h>
drivers/net/wireless/zd1211rw/zd_def.h +0 -1
index deb99d1..505b4d7 100644
@@ -21,7 +21,6 @@
 #include <linux/kernel.h>
 #include <linux/stringify.h>
 #include <linux/device.h>
-#include <linux/kernel.h>
 
 typedef u16 __nocast zd_addr_t;
author
#3 lore raw

Re: [00/37] Clean up duplicate includes (resend patch 28)

In reply to Satyam Sharma
Quoted 10 lines · On Sunday 22 July 2007 04:30:41 you wrote:
Quoted 2 lines · Jesper Juhl

[...]
These are the patches in this series :

Ok, I've reviewed all patches in this series except:

Quoted 3 lines

[PATCH][12/37] Clean up duplicate includes in drivers/net/ [PATCH][28/37] Clean up duplicate includes in net/ipv4/ [PATCH][32/37] Clean up duplicate includes in net/sunrpc/

Here's patch 28 again.

net/ipv4/ip_output.c +0 -1
index c9e2b5e..0f1d7be 100644
@@ -75,7 +75,6 @@
 #include <net/icmp.h>
 #include <net/checksum.h>
 #include <net/inetpeer.h>
-#include <net/checksum.h>
 #include <linux/igmp.h>
 #include <linux/netfilter_ipv4.h>
 #include <linux/netfilter_bridge.h>
net/ipv4/ipvs/ip_vs_ctl.c +0 -1
index e1052bc..c32781d 100644
@@ -29,7 +29,6 @@
 #include <linux/proc_fs.h>
 #include <linux/workqueue.h>
 #include <linux/swap.h>
-#include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 
 #include <linux/netfilter.h>
net/ipv4/netfilter/ipt_CLUSTERIP.c +0 -1
index dcc12b1..69bd362 100644
@@ -19,7 +19,6 @@
 #include <linux/udp.h>
 #include <linux/icmp.h>
 #include <linux/if_arp.h>
-#include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/netfilter_arp.h>
 #include <linux/netfilter/x_tables.h>
author
#4 lore raw

Re: [00/37] Clean up duplicate includes (resend patch 32)

In reply to Satyam Sharma
Quoted 10 lines · On Sunday 22 July 2007 04:30:41 Satyam Sharma wrote:
Quoted 2 lines · Jesper Juhl

[...]
These are the patches in this series :

Ok, I've reviewed all patches in this series except:

Quoted 3 lines

[PATCH][12/37] Clean up duplicate includes in drivers/net/ [PATCH][28/37] Clean up duplicate includes in net/ipv4/ [PATCH][32/37] Clean up duplicate includes in net/sunrpc/

Here's 32 :

net/sunrpc/auth_gss/svcauth_gss.c +0 -1
index 4906975..794ce55 100644
@@ -42,7 +42,6 @@
 #include <linux/pagemap.h>
 
 #include <linux/sunrpc/auth_gss.h>
-#include <linux/sunrpc/svcauth.h>
 #include <linux/sunrpc/gss_err.h>
 #include <linux/sunrpc/svcauth.h>
 #include <linux/sunrpc/svcauth_gss.h>
#5 lore raw
In reply to Satyam Sharma
Quoted 9 lines · Satyam Sharma
Quoted 2 lines · Jesper Juhl

[...]
These are the patches in this series :

Ok, I've reviewed all patches in this series except:

Quoted 3 lines

[PATCH][12/37] Clean up duplicate includes in drivers/net/ [PATCH][28/37] Clean up duplicate includes in net/ipv4/ [PATCH][32/37] Clean up duplicate includes in net/sunrpc/

And I also looked over these three after your resends.

Quoted 5 lines

Anyway, the entire series was OK, just removing a #include line when that exact same header was already #include'd in the same file. [ I also wonder if this patchset ends up exposing some header-include-ordering problems that were previously hidden, actually. ]

Like you said you built an allmodconfig, everything should be OK. [ Except for modules that didn't get included in allmodconfig because your arch might not have supported it -- but even then, your patches are obviously correct and will only expose issues elsewhere if we do see any build breakage, but which isn't likely in any case. ]

So the entire series is reviewed and looks good to me :-)

Thanks,
Satyam