[PATCH 0/6] clean up patches

[PATCH 0/6] clean up patches

[Francisco Alecrim]

Hi all,

The series of 6 patches contain clean ups related to duplicated headers.

Regards,
Alecrim.

[PATCH 1/6] SPI: clean up remove duplicated headers

[Francisco Alecrim]

Remove duplicated headers in SPI subsystem:
drivers/spi/spi_butterfly.c: linux/spi/spi_bitbang.h is included more than once.
drivers/spi/spi_lm70llp.c: linux/spi/spi_bitbang.h is included more than once.
drivers/spi/spi_s3c24xx_gpio.c: linux/spi/spi_bitbang.h is included more than once.

Signed-off-by: Francisco Alecrim <francisco.alecrim@indt.org.br>
---
 drivers/spi/spi_butterfly.c    |    1 -
 drivers/spi/spi_lm70llp.c      |    1 -
 drivers/spi/spi_s3c24xx_gpio.c |    1 -
 3 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/drivers/spi/spi_butterfly.c b/drivers/spi/spi_butterfly.c
index 0ee2b20..54eed48 100644
--- a/drivers/spi/spi_butterfly.c
+++ b/drivers/spi/spi_butterfly.c
@@ -150,7 +150,6 @@ static void butterfly_chipselect(struct spi_device *spi, int value)
 //#define	spidelay	ndelay
 
 #define	EXPAND_BITBANG_TXRX
-#include <linux/spi/spi_bitbang.h>
 
 static u32
 butterfly_txrx_word_mode0(struct spi_device *spi,
diff --git a/drivers/spi/spi_lm70llp.c b/drivers/spi/spi_lm70llp.c
index 39d8d8a..9128ed5 100644
--- a/drivers/spi/spi_lm70llp.c
+++ b/drivers/spi/spi_lm70llp.c
@@ -167,7 +167,6 @@ static inline int getmiso(struct spi_device *s)
 /*--------------------------------------------------------------------*/
 
 #define EXPAND_BITBANG_TXRX 1
-#include <linux/spi/spi_bitbang.h>
 
 static void lm70_chipselect(struct spi_device *spi, int value)
 {
diff --git a/drivers/spi/spi_s3c24xx_gpio.c b/drivers/spi/spi_s3c24xx_gpio.c
index 109d82c..fe6aff7 100644
--- a/drivers/spi/spi_s3c24xx_gpio.c
+++ b/drivers/spi/spi_s3c24xx_gpio.c
@@ -58,7 +58,6 @@ static inline u32 getmiso(struct spi_device *dev)
 #define spidelay(x) ndelay(x)
 
 #define	EXPAND_BITBANG_TXRX
-#include <linux/spi/spi_bitbang.h>
 
 
 static u32 s3c2410_spigpio_txrx_mode0(struct spi_device *spi,
-- 
1.5.3.7

[PATCH 2/6] drivers/parisc/ccio-dma.c: clean up remove duplicated headers

[Francisco Alecrim]

Remove duplicated headers in drivers/parisc/ccio-dma.c:
drivers/parisc/ccio-dma.c: linux/proc_fs.h is included more than once.

Signed-off-by: Francisco Alecrim <francisco.alecrim@indt.org.br>
---
 drivers/parisc/ccio-dma.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index 7c60cbd..b67b056 100644
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
@@ -76,7 +76,6 @@
 #undef CCIO_MAP_STATS
 #endif
 
-#include <linux/proc_fs.h>
 #include <asm/runway.h>		/* for proc_runway_root */
 
 #ifdef DEBUG_CCIO_INIT
-- 
1.5.3.7

[PATCH 3/6] drivers/char/keyboard.c: clean up remove duplicated headers

[Francisco Alecrim]

Remove duplicated headers in drivers/char/keyboard.c:
drivers/char/keyboard.c: linux/consolemap.h is included more than once.

Signed-off-by: Francisco Alecrim <francisco.alecrim@indt.org.br>
---
 drivers/char/keyboard.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c
index fc54d23..2c21fb1 100644
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
@@ -38,7 +38,6 @@
 #include <linux/kbd_kern.h>
 #include <linux/kbd_diacr.h>
 #include <linux/vt_kern.h>
-#include <linux/consolemap.h>
 #include <linux/sysrq.h>
 #include <linux/input.h>
 #include <linux/reboot.h>
-- 
1.5.3.7

[PATCH 4/6] drivers/input: clean up remove duplicated headers

[Francisco Alecrim]

Remove duplicated headers in drivers/input:
drivers/input/keyboard/bf54x-keys.c: linux/irq.h is included more than once.
drivers/input/keyboard/jornada720_kbd.c: linux/init.h is included more than once.
drivers/input/gameport/gameport.c: linux/sched.h is included more than once.

Signed-off-by: Francisco Alecrim <francisco.alecrim@indt.org.br>
---
 drivers/input/gameport/gameport.c       |    1 -
 drivers/input/keyboard/bf54x-keys.c     |    1 -
 drivers/input/keyboard/jornada720_kbd.c |    1 -
 3 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
index bfc6061..682a70e 100644
--- a/drivers/input/gameport/gameport.c
+++ b/drivers/input/gameport/gameport.c
@@ -17,7 +17,6 @@
 #include <linux/init.h>
 #include <linux/gameport.h>
 #include <linux/wait.h>
-#include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/kthread.h>
diff --git a/drivers/input/keyboard/bf54x-keys.c b/drivers/input/keyboard/bf54x-keys.c
index e5f4da9..05e3494 100644
--- a/drivers/input/keyboard/bf54x-keys.c
+++ b/drivers/input/keyboard/bf54x-keys.c
@@ -42,7 +42,6 @@
 #include <linux/delay.h>
 #include <linux/platform_device.h>
 #include <linux/input.h>
-#include <linux/irq.h>
 
 #include <asm/portmux.h>
 #include <asm/mach/bf54x_keys.h>
diff --git a/drivers/input/keyboard/jornada720_kbd.c b/drivers/input/keyboard/jornada720_kbd.c
index e6696b3..4dfdfef 100644
--- a/drivers/input/keyboard/jornada720_kbd.c
+++ b/drivers/input/keyboard/jornada720_kbd.c
@@ -19,7 +19,6 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
-#include <linux/init.h>
 #include <linux/input.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-- 
1.5.3.7

[PATCH 5/6] drivers/net: clean up remove duplicated headers

[Francisco Alecrim]

Remove duplicated headers in drivers/net:
drivers/net/ucc_geth_ethtool.c: asm/uaccess.h is included more than once.
drivers/net/irda/ks959-sir.c: linux/module.h is included more than once.
drivers/net/irda/ksdazzle-sir.c: linux/module.h is included more than once.

Signed-off-by: Francisco Alecrim <francisco.alecrim@indt.org.br>
---
 drivers/net/irda/ks959-sir.c    |    1 -
 drivers/net/irda/ksdazzle-sir.c |    1 -
 drivers/net/ucc_geth_ethtool.c  |    1 -
 3 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/drivers/net/irda/ks959-sir.c b/drivers/net/irda/ks959-sir.c
index 8c257a5..db48998 100644
--- a/drivers/net/irda/ks959-sir.c
+++ b/drivers/net/irda/ks959-sir.c
@@ -118,7 +118,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>
diff --git a/drivers/net/irda/ksdazzle-sir.c b/drivers/net/irda/ksdazzle-sir.c
index d01a285..10c25b2 100644
--- a/drivers/net/irda/ksdazzle-sir.c
+++ b/drivers/net/irda/ksdazzle-sir.c
@@ -82,7 +82,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>
diff --git a/drivers/net/ucc_geth_ethtool.c b/drivers/net/ucc_geth_ethtool.c
index 9a9622c..68c8700 100644
--- a/drivers/net/ucc_geth_ethtool.c
+++ b/drivers/net/ucc_geth_ethtool.c
@@ -37,7 +37,6 @@
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 #include <asm/types.h>
-#include <asm/uaccess.h>
 
 #include "ucc_geth.h"
 #include "ucc_geth_mii.h"
-- 
1.5.3.7

[PATCH 6/6] drivers/misc/atmel-ssc.c: clean up remove duplicated headers

[Francisco Alecrim]

Remove duplicated headers in drivers/misc/atmel-ssc.c:
drivers/misc/atmel-ssc.c: linux/list.h is included more than once.

Signed-off-by: Francisco Alecrim <francisco.alecrim@indt.org.br>
---
 drivers/misc/atmel-ssc.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/misc/atmel-ssc.c b/drivers/misc/atmel-ssc.c
index 058ccac..992d371 100644
--- a/drivers/misc/atmel-ssc.c
+++ b/drivers/misc/atmel-ssc.c
@@ -13,7 +13,6 @@
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/io.h>
-#include <linux/list.h>
 #include <linux/spinlock.h>
 #include <linux/atmel-ssc.h>
 
-- 
1.5.3.7

Re: [PATCH 3/6] drivers/char/keyboard.c: clean up remove duplicated headers

[Dmitry Torokhov]

On Fri, Dec 14, 2007 at 02:56:47PM -0400, Francisco Alecrim wrote:
> Remove duplicated headers in drivers/char/keyboard.c:
> drivers/char/keyboard.c: linux/consolemap.h is included more than once.
> 
> Signed-off-by: Francisco Alecrim <francisco.alecrim@indt.org.br>

Applied, thank you Francisco.

-- 
Dmitry

Re: [PATCH 2/6] drivers/parisc/ccio-dma.c: clean up remove duplicated headers

[Kyle McMartin]

On Fri, Dec 14, 2007 at 02:56:46PM -0400, Francisco Alecrim wrote:
> Remove duplicated headers in drivers/parisc/ccio-dma.c:
> drivers/parisc/ccio-dma.c: linux/proc_fs.h is included more than once.
> 

Seems kind of pointless, but I'll apply it.

cheers, Kyle