| From db415ed6fbe8adfb1e2ae191166c0a0cd883ed2d Mon Sep 17 00:00:00 2001 |
| From: Paul Gortmaker <paul.gortmaker@windriver.com> |
| Date: Tue, 21 Jan 2014 16:22:47 -0500 |
| Subject: spi: delete non-required instances of include <linux/init.h> |
| |
| None of these files are actually using any __init type directives |
| and hence don't need to include <linux/init.h>. Most are just a |
| left over from __devinit and __cpuinit removal, or simply due to |
| code getting copied from one driver to the next. |
| |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| Signed-off-by: Mark Brown <broonie@linaro.org> |
| (cherry picked from commit 3a44623d5e1404b29786f1afd225d1aa04a4ae90) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/spi/spi-altera.c | 1 - |
| drivers/spi/spi-ath79.c | 1 - |
| drivers/spi/spi-atmel.c | 1 - |
| drivers/spi/spi-bcm63xx.c | 1 - |
| drivers/spi/spi-bfin-sport.c | 1 - |
| drivers/spi/spi-bitbang.c | 1 - |
| drivers/spi/spi-clps711x.c | 1 - |
| drivers/spi/spi-gpio.c | 1 - |
| drivers/spi/spi-imx.c | 1 - |
| drivers/spi/spi-mpc512x-psc.c | 1 - |
| drivers/spi/spi-mpc52xx-psc.c | 1 - |
| drivers/spi/spi-mpc52xx.c | 1 - |
| drivers/spi/spi-mxs.c | 1 - |
| drivers/spi/spi-nuc900.c | 1 - |
| drivers/spi/spi-oc-tiny.c | 1 - |
| drivers/spi/spi-octeon.c | 1 - |
| drivers/spi/spi-omap2-mcspi.c | 1 - |
| drivers/spi/spi-orion.c | 1 - |
| drivers/spi/spi-ppc4xx.c | 1 - |
| drivers/spi/spi-pxa2xx-dma.c | 1 - |
| drivers/spi/spi-pxa2xx-pxadma.c | 1 - |
| drivers/spi/spi-s3c24xx.c | 1 - |
| drivers/spi/spi-sh-msiof.c | 1 - |
| drivers/spi/spi-sh-sci.c | 1 - |
| drivers/spi/spi-tegra114.c | 1 - |
| drivers/spi/spi-tegra20-sflash.c | 1 - |
| drivers/spi/spi-tegra20-slink.c | 1 - |
| drivers/spi/spi-xcomm.c | 1 - |
| drivers/spi/spi-xilinx.c | 1 - |
| 29 files changed, 29 deletions(-) |
| |
| diff --git a/drivers/spi/spi-altera.c b/drivers/spi/spi-altera.c |
| index 5d7deaf62867..1928b835e870 100644 |
| --- a/drivers/spi/spi-altera.c |
| +++ b/drivers/spi/spi-altera.c |
| @@ -13,7 +13,6 @@ |
| * published by the Free Software Foundation. |
| */ |
| |
| -#include <linux/init.h> |
| #include <linux/interrupt.h> |
| #include <linux/errno.h> |
| #include <linux/module.h> |
| diff --git a/drivers/spi/spi-ath79.c b/drivers/spi/spi-ath79.c |
| index c3b2fb9b6713..3898b0b9ee77 100644 |
| --- a/drivers/spi/spi-ath79.c |
| +++ b/drivers/spi/spi-ath79.c |
| @@ -14,7 +14,6 @@ |
| |
| #include <linux/kernel.h> |
| #include <linux/module.h> |
| -#include <linux/init.h> |
| #include <linux/delay.h> |
| #include <linux/spinlock.h> |
| #include <linux/workqueue.h> |
| diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c |
| index 5d7b07f08326..af8a3361970c 100644 |
| --- a/drivers/spi/spi-atmel.c |
| +++ b/drivers/spi/spi-atmel.c |
| @@ -9,7 +9,6 @@ |
| */ |
| |
| #include <linux/kernel.h> |
| -#include <linux/init.h> |
| #include <linux/clk.h> |
| #include <linux/module.h> |
| #include <linux/platform_device.h> |
| diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c |
| index 77286aef2adf..9e9ee5f08647 100644 |
| --- a/drivers/spi/spi-bcm63xx.c |
| +++ b/drivers/spi/spi-bcm63xx.c |
| @@ -20,7 +20,6 @@ |
| */ |
| |
| #include <linux/kernel.h> |
| -#include <linux/init.h> |
| #include <linux/clk.h> |
| #include <linux/io.h> |
| #include <linux/module.h> |
| diff --git a/drivers/spi/spi-bfin-sport.c b/drivers/spi/spi-bfin-sport.c |
| index 38941e5920b5..f515c5e9db57 100644 |
| --- a/drivers/spi/spi-bfin-sport.c |
| +++ b/drivers/spi/spi-bfin-sport.c |
| @@ -8,7 +8,6 @@ |
| * Licensed under the GPL-2 or later. |
| */ |
| |
| -#include <linux/init.h> |
| #include <linux/module.h> |
| #include <linux/delay.h> |
| #include <linux/device.h> |
| diff --git a/drivers/spi/spi-bitbang.c b/drivers/spi/spi-bitbang.c |
| index bd222f6b677d..3bfdb851960b 100644 |
| --- a/drivers/spi/spi-bitbang.c |
| +++ b/drivers/spi/spi-bitbang.c |
| @@ -16,7 +16,6 @@ |
| * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| */ |
| |
| -#include <linux/init.h> |
| #include <linux/spinlock.h> |
| #include <linux/workqueue.h> |
| #include <linux/interrupt.h> |
| diff --git a/drivers/spi/spi-clps711x.c b/drivers/spi/spi-clps711x.c |
| index 374ba4a48a9e..bee864de5305 100644 |
| --- a/drivers/spi/spi-clps711x.c |
| +++ b/drivers/spi/spi-clps711x.c |
| @@ -11,7 +11,6 @@ |
| |
| #include <linux/io.h> |
| #include <linux/clk.h> |
| -#include <linux/init.h> |
| #include <linux/gpio.h> |
| #include <linux/delay.h> |
| #include <linux/module.h> |
| diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c |
| index 7beeb29472ac..cfc9fb3048d8 100644 |
| --- a/drivers/spi/spi-gpio.c |
| +++ b/drivers/spi/spi-gpio.c |
| @@ -19,7 +19,6 @@ |
| */ |
| #include <linux/kernel.h> |
| #include <linux/module.h> |
| -#include <linux/init.h> |
| #include <linux/platform_device.h> |
| #include <linux/gpio.h> |
| #include <linux/of.h> |
| diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c |
| index 47f15d97e7fa..3af247c71dbd 100644 |
| --- a/drivers/spi/spi-imx.c |
| +++ b/drivers/spi/spi-imx.c |
| @@ -23,7 +23,6 @@ |
| #include <linux/delay.h> |
| #include <linux/err.h> |
| #include <linux/gpio.h> |
| -#include <linux/init.h> |
| #include <linux/interrupt.h> |
| #include <linux/io.h> |
| #include <linux/irq.h> |
| diff --git a/drivers/spi/spi-mpc512x-psc.c b/drivers/spi/spi-mpc512x-psc.c |
| index 5032141eeeec..56cead98e7a5 100644 |
| --- a/drivers/spi/spi-mpc512x-psc.c |
| +++ b/drivers/spi/spi-mpc512x-psc.c |
| @@ -16,7 +16,6 @@ |
| |
| #include <linux/module.h> |
| #include <linux/kernel.h> |
| -#include <linux/init.h> |
| #include <linux/errno.h> |
| #include <linux/interrupt.h> |
| #include <linux/of_address.h> |
| diff --git a/drivers/spi/spi-mpc52xx-psc.c b/drivers/spi/spi-mpc52xx-psc.c |
| index 00ba910ab302..3d18d9351185 100644 |
| --- a/drivers/spi/spi-mpc52xx-psc.c |
| +++ b/drivers/spi/spi-mpc52xx-psc.c |
| @@ -12,7 +12,6 @@ |
| */ |
| |
| #include <linux/module.h> |
| -#include <linux/init.h> |
| #include <linux/types.h> |
| #include <linux/errno.h> |
| #include <linux/interrupt.h> |
| diff --git a/drivers/spi/spi-mpc52xx.c b/drivers/spi/spi-mpc52xx.c |
| index 7c675fe83101..f573c3c09968 100644 |
| --- a/drivers/spi/spi-mpc52xx.c |
| +++ b/drivers/spi/spi-mpc52xx.c |
| @@ -12,7 +12,6 @@ |
| */ |
| |
| #include <linux/module.h> |
| -#include <linux/init.h> |
| #include <linux/errno.h> |
| #include <linux/of_platform.h> |
| #include <linux/interrupt.h> |
| diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c |
| index 79e5aa2250c8..17bb9a9285ab 100644 |
| --- a/drivers/spi/spi-mxs.c |
| +++ b/drivers/spi/spi-mxs.c |
| @@ -29,7 +29,6 @@ |
| */ |
| |
| #include <linux/kernel.h> |
| -#include <linux/init.h> |
| #include <linux/ioport.h> |
| #include <linux/of.h> |
| #include <linux/of_device.h> |
| diff --git a/drivers/spi/spi-nuc900.c b/drivers/spi/spi-nuc900.c |
| index bae97ffec4b9..d8d55c7f7075 100644 |
| --- a/drivers/spi/spi-nuc900.c |
| +++ b/drivers/spi/spi-nuc900.c |
| @@ -9,7 +9,6 @@ |
| */ |
| |
| #include <linux/module.h> |
| -#include <linux/init.h> |
| #include <linux/spinlock.h> |
| #include <linux/workqueue.h> |
| #include <linux/interrupt.h> |
| diff --git a/drivers/spi/spi-oc-tiny.c b/drivers/spi/spi-oc-tiny.c |
| index f7c896e2981e..022774e158f1 100644 |
| --- a/drivers/spi/spi-oc-tiny.c |
| +++ b/drivers/spi/spi-oc-tiny.c |
| @@ -15,7 +15,6 @@ |
| * published by the Free Software Foundation. |
| */ |
| |
| -#include <linux/init.h> |
| #include <linux/interrupt.h> |
| #include <linux/errno.h> |
| #include <linux/module.h> |
| diff --git a/drivers/spi/spi-octeon.c b/drivers/spi/spi-octeon.c |
| index 67249a48b391..5665ae9ed92f 100644 |
| --- a/drivers/spi/spi-octeon.c |
| +++ b/drivers/spi/spi-octeon.c |
| @@ -11,7 +11,6 @@ |
| #include <linux/spi/spi.h> |
| #include <linux/module.h> |
| #include <linux/delay.h> |
| -#include <linux/init.h> |
| #include <linux/io.h> |
| #include <linux/of.h> |
| |
| diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c |
| index a72127f08e39..94f133cb2770 100644 |
| --- a/drivers/spi/spi-omap2-mcspi.c |
| +++ b/drivers/spi/spi-omap2-mcspi.c |
| @@ -22,7 +22,6 @@ |
| */ |
| |
| #include <linux/kernel.h> |
| -#include <linux/init.h> |
| #include <linux/interrupt.h> |
| #include <linux/module.h> |
| #include <linux/device.h> |
| diff --git a/drivers/spi/spi-orion.c b/drivers/spi/spi-orion.c |
| index 7f2121fe2622..a362425400ea 100644 |
| --- a/drivers/spi/spi-orion.c |
| +++ b/drivers/spi/spi-orion.c |
| @@ -9,7 +9,6 @@ |
| * published by the Free Software Foundation. |
| */ |
| |
| -#include <linux/init.h> |
| #include <linux/interrupt.h> |
| #include <linux/delay.h> |
| #include <linux/platform_device.h> |
| diff --git a/drivers/spi/spi-ppc4xx.c b/drivers/spi/spi-ppc4xx.c |
| index 5ee56726f8d0..80b8408ac3e3 100644 |
| --- a/drivers/spi/spi-ppc4xx.c |
| +++ b/drivers/spi/spi-ppc4xx.c |
| @@ -24,7 +24,6 @@ |
| */ |
| |
| #include <linux/module.h> |
| -#include <linux/init.h> |
| #include <linux/sched.h> |
| #include <linux/slab.h> |
| #include <linux/errno.h> |
| diff --git a/drivers/spi/spi-pxa2xx-dma.c b/drivers/spi/spi-pxa2xx-dma.c |
| index 3c0b55125f1e..713af4806f26 100644 |
| --- a/drivers/spi/spi-pxa2xx-dma.c |
| +++ b/drivers/spi/spi-pxa2xx-dma.c |
| @@ -9,7 +9,6 @@ |
| * published by the Free Software Foundation. |
| */ |
| |
| -#include <linux/init.h> |
| #include <linux/device.h> |
| #include <linux/dma-mapping.h> |
| #include <linux/dmaengine.h> |
| diff --git a/drivers/spi/spi-pxa2xx-pxadma.c b/drivers/spi/spi-pxa2xx-pxadma.c |
| index 2916efc7cfe5..e8a26f25d5c0 100644 |
| --- a/drivers/spi/spi-pxa2xx-pxadma.c |
| +++ b/drivers/spi/spi-pxa2xx-pxadma.c |
| @@ -18,7 +18,6 @@ |
| * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| */ |
| |
| -#include <linux/init.h> |
| #include <linux/delay.h> |
| #include <linux/device.h> |
| #include <linux/dma-mapping.h> |
| diff --git a/drivers/spi/spi-s3c24xx.c b/drivers/spi/spi-s3c24xx.c |
| index 746424aa5353..c20df45204e2 100644 |
| --- a/drivers/spi/spi-s3c24xx.c |
| +++ b/drivers/spi/spi-s3c24xx.c |
| @@ -9,7 +9,6 @@ |
| * |
| */ |
| |
| -#include <linux/init.h> |
| #include <linux/spinlock.h> |
| #include <linux/workqueue.h> |
| #include <linux/interrupt.h> |
| diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c |
| index 81cc02f5f9b0..33474061b742 100644 |
| --- a/drivers/spi/spi-sh-msiof.c |
| +++ b/drivers/spi/spi-sh-msiof.c |
| @@ -15,7 +15,6 @@ |
| #include <linux/delay.h> |
| #include <linux/err.h> |
| #include <linux/gpio.h> |
| -#include <linux/init.h> |
| #include <linux/interrupt.h> |
| #include <linux/io.h> |
| #include <linux/kernel.h> |
| diff --git a/drivers/spi/spi-sh-sci.c b/drivers/spi/spi-sh-sci.c |
| index 38eb24df796c..85c2efd57c80 100644 |
| --- a/drivers/spi/spi-sh-sci.c |
| +++ b/drivers/spi/spi-sh-sci.c |
| @@ -14,7 +14,6 @@ |
| */ |
| |
| #include <linux/kernel.h> |
| -#include <linux/init.h> |
| #include <linux/delay.h> |
| #include <linux/spinlock.h> |
| #include <linux/workqueue.h> |
| diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c |
| index 413c71843492..3f61bbf643e2 100644 |
| --- a/drivers/spi/spi-tegra114.c |
| +++ b/drivers/spi/spi-tegra114.c |
| @@ -23,7 +23,6 @@ |
| #include <linux/dma-mapping.h> |
| #include <linux/dmapool.h> |
| #include <linux/err.h> |
| -#include <linux/init.h> |
| #include <linux/interrupt.h> |
| #include <linux/io.h> |
| #include <linux/kernel.h> |
| diff --git a/drivers/spi/spi-tegra20-sflash.c b/drivers/spi/spi-tegra20-sflash.c |
| index 08794977f21a..18037ab646d6 100644 |
| --- a/drivers/spi/spi-tegra20-sflash.c |
| +++ b/drivers/spi/spi-tegra20-sflash.c |
| @@ -22,7 +22,6 @@ |
| #include <linux/completion.h> |
| #include <linux/delay.h> |
| #include <linux/err.h> |
| -#include <linux/init.h> |
| #include <linux/interrupt.h> |
| #include <linux/io.h> |
| #include <linux/kernel.h> |
| diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c |
| index be3a069879c3..8d62710d587e 100644 |
| --- a/drivers/spi/spi-tegra20-slink.c |
| +++ b/drivers/spi/spi-tegra20-slink.c |
| @@ -23,7 +23,6 @@ |
| #include <linux/dma-mapping.h> |
| #include <linux/dmapool.h> |
| #include <linux/err.h> |
| -#include <linux/init.h> |
| #include <linux/interrupt.h> |
| #include <linux/io.h> |
| #include <linux/kernel.h> |
| diff --git a/drivers/spi/spi-xcomm.c b/drivers/spi/spi-xcomm.c |
| index 24c40b13dab1..350a76b7e8d4 100644 |
| --- a/drivers/spi/spi-xcomm.c |
| +++ b/drivers/spi/spi-xcomm.c |
| @@ -8,7 +8,6 @@ |
| */ |
| |
| #include <linux/kernel.h> |
| -#include <linux/init.h> |
| #include <linux/module.h> |
| #include <linux/delay.h> |
| #include <linux/i2c.h> |
| diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c |
| index 6d4ce4615163..e6cd1112ae40 100644 |
| --- a/drivers/spi/spi-xilinx.c |
| +++ b/drivers/spi/spi-xilinx.c |
| @@ -14,7 +14,6 @@ |
| */ |
| |
| #include <linux/module.h> |
| -#include <linux/init.h> |
| #include <linux/interrupt.h> |
| #include <linux/of.h> |
| #include <linux/platform_device.h> |
| -- |
| 2.1.2 |
| |