[PATCH 59/73] drivers/gpio: delete non-required instances of include <linux/init.h>

[PATCH 59/73] drivers/gpio: delete non-required instances of include <linux/init.h>

[Paul Gortmaker]

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.

Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Alexandre Courbot <gnurou@gmail.com>
Cc: linux-gpio@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 drivers/gpio/gpio-74x164.c    | 1 -
 drivers/gpio/gpio-adp5520.c   | 1 -
 drivers/gpio/gpio-adp5588.c   | 1 -
 drivers/gpio/gpio-generic.c   | 1 -
 drivers/gpio/gpio-grgpio.c    | 1 -
 drivers/gpio/gpio-janz-ttl.c  | 1 -
 drivers/gpio/gpio-kempld.c    | 1 -
 drivers/gpio/gpio-lpc32xx.c   | 1 -
 drivers/gpio/gpio-max730x.c   | 1 -
 drivers/gpio/gpio-moxart.c    | 1 -
 drivers/gpio/gpio-msm-v2.c    | 1 -
 drivers/gpio/gpio-rcar.c      | 1 -
 drivers/gpio/gpio-rdc321x.c   | 1 -
 drivers/gpio/gpio-sch.c       | 1 -
 drivers/gpio/gpio-sodaville.c | 1 -
 drivers/gpio/gpio-twl6040.c   | 1 -
 drivers/gpio/gpio-vr41xx.c    | 1 -
 17 files changed, 17 deletions(-)

diff --git a/drivers/gpio/gpio-74x164.c b/drivers/gpio/gpio-74x164.c
index e4ae298..8aa8a97 100644
--- a/drivers/gpio/gpio-74x164.c
+++ b/drivers/gpio/gpio-74x164.c
@@ -9,7 +9,6 @@
  *  published by the Free Software Foundation.
  */
 
-#include <linux/init.h>
 #include <linux/mutex.h>
 #include <linux/spi/spi.h>
 #include <linux/gpio.h>
diff --git a/drivers/gpio/gpio-adp5520.c b/drivers/gpio/gpio-adp5520.c
index 6132659..00f54fa 100644
--- a/drivers/gpio/gpio-adp5520.c
+++ b/drivers/gpio/gpio-adp5520.c
@@ -9,7 +9,6 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/mfd/adp5520.h>
 
diff --git a/drivers/gpio/gpio-adp5588.c b/drivers/gpio/gpio-adp5588.c
index 3f190e6..a5b7a20 100644
--- a/drivers/gpio/gpio-adp5588.c
+++ b/drivers/gpio/gpio-adp5588.c
@@ -10,7 +10,6 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
-#include <linux/init.h>
 #include <linux/i2c.h>
 #include <linux/gpio.h>
 #include <linux/interrupt.h>
diff --git a/drivers/gpio/gpio-generic.c b/drivers/gpio/gpio-generic.c
index d2196bf..cdc8437 100644
--- a/drivers/gpio/gpio-generic.c
+++ b/drivers/gpio/gpio-generic.c
@@ -44,7 +44,6 @@ o        `                     ~~~~\___/~~~~    ` controller in FPGA is ,.`
  *               `.......````.```
  */
 
-#include <linux/init.h>
 #include <linux/err.h>
 #include <linux/bug.h>
 #include <linux/kernel.h>
diff --git a/drivers/gpio/gpio-grgpio.c b/drivers/gpio/gpio-grgpio.c
index 84d2478..d137fd3 100644
--- a/drivers/gpio/gpio-grgpio.c
+++ b/drivers/gpio/gpio-grgpio.c
@@ -22,7 +22,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/spinlock.h>
 #include <linux/io.h>
 #include <linux/of.h>
diff --git a/drivers/gpio/gpio-janz-ttl.c b/drivers/gpio/gpio-janz-ttl.c
index 2ecd3a0..ab0bfb9 100644
--- a/drivers/gpio/gpio-janz-ttl.c
+++ b/drivers/gpio/gpio-janz-ttl.c
@@ -11,7 +11,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/platform_device.h>
diff --git a/drivers/gpio/gpio-kempld.c b/drivers/gpio/gpio-kempld.c
index c6d8817..8a2ff81 100644
--- a/drivers/gpio/gpio-kempld.c
+++ b/drivers/gpio/gpio-kempld.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/bitops.h>
diff --git a/drivers/gpio/gpio-lpc32xx.c b/drivers/gpio/gpio-lpc32xx.c
index 225344d..f2f9353 100644
--- a/drivers/gpio/gpio-lpc32xx.c
+++ b/drivers/gpio/gpio-lpc32xx.c
@@ -17,7 +17,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/io.h>
 #include <linux/errno.h>
 #include <linux/gpio.h>
diff --git a/drivers/gpio/gpio-max730x.c b/drivers/gpio/gpio-max730x.c
index 8672755..f8c01a4 100644
--- a/drivers/gpio/gpio-max730x.c
+++ b/drivers/gpio/gpio-max730x.c
@@ -31,7 +31,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/mutex.h>
 #include <linux/spi/max7301.h>
diff --git a/drivers/gpio/gpio-moxart.c b/drivers/gpio/gpio-moxart.c
index 2af9900..799da97 100644
--- a/drivers/gpio/gpio-moxart.c
+++ b/drivers/gpio/gpio-moxart.c
@@ -11,7 +11,6 @@
  */
 
 #include <linux/err.h>
-#include <linux/init.h>
 #include <linux/irq.h>
 #include <linux/io.h>
 #include <linux/gpio.h>
diff --git a/drivers/gpio/gpio-msm-v2.c b/drivers/gpio/gpio-msm-v2.c
index a3351ac..f817e59 100644
--- a/drivers/gpio/gpio-msm-v2.c
+++ b/drivers/gpio/gpio-msm-v2.c
@@ -21,7 +21,6 @@
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/gpio.h>
-#include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/irqchip/chained_irq.h>
diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
index ca76ce7..32963f2 100644
--- a/drivers/gpio/gpio-rcar.c
+++ b/drivers/gpio/gpio-rcar.c
@@ -15,7 +15,6 @@
 
 #include <linux/err.h>
 #include <linux/gpio.h>
-#include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
diff --git a/drivers/gpio/gpio-rdc321x.c b/drivers/gpio/gpio-rdc321x.c
index 88577c3..45e1fc7 100644
--- a/drivers/gpio/gpio-rdc321x.c
+++ b/drivers/gpio/gpio-rdc321x.c
@@ -21,7 +21,6 @@
  */
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/spinlock.h>
 #include <linux/platform_device.h>
 #include <linux/pci.h>
diff --git a/drivers/gpio/gpio-sch.c b/drivers/gpio/gpio-sch.c
index 5af6571..4dd3ded 100644
--- a/drivers/gpio/gpio-sch.c
+++ b/drivers/gpio/gpio-sch.c
@@ -18,7 +18,6 @@
  *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/io.h>
diff --git a/drivers/gpio/gpio-sodaville.c b/drivers/gpio/gpio-sodaville.c
index 7c6c518..8bd814f 100644
--- a/drivers/gpio/gpio-sodaville.c
+++ b/drivers/gpio/gpio-sodaville.c
@@ -11,7 +11,6 @@
 
 #include <linux/errno.h>
 #include <linux/gpio.h>
-#include <linux/init.h>
 #include <linux/io.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
diff --git a/drivers/gpio/gpio-twl6040.c b/drivers/gpio/gpio-twl6040.c
index 0caf5cd..9377fc0 100644
--- a/drivers/gpio/gpio-twl6040.c
+++ b/drivers/gpio/gpio-twl6040.c
@@ -23,7 +23,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/kthread.h>
 #include <linux/irq.h>
 #include <linux/gpio.h>
diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
index 9902732..b983bc0 100644
--- a/drivers/gpio/gpio-vr41xx.c
+++ b/drivers/gpio/gpio-vr41xx.c
@@ -22,7 +22,6 @@
 #include <linux/errno.h>
 #include <linux/fs.h>
 #include <linux/gpio.h>
-#include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/irq.h>
-- 
1.8.4.1

Re: [PATCH 59/73] drivers/gpio: delete non-required instances of include <linux/init.h>

[Linus Walleij]

On Tue, Jan 21, 2014 at 10:23 PM, Paul Gortmaker
<paul.gortmaker@windriver.com> wrote:

> 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.
>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Alexandre Courbot <gnurou@gmail.com>
> Cc: linux-gpio@vger.kernel.org
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

Patch applied for v3.15.

Yours,
Linus Walleij

Re: [PATCH 59/73] drivers/gpio: delete non-required instances of include <linux/init.h>

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1374 bytes --]

Hi Linus,

On Thu, 23 Jan 2014 09:12:43 +0100 Linus Walleij <linus.walleij@linaro.org> wrote:
>
> On Tue, Jan 21, 2014 at 10:23 PM, Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
> 
> > 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.
> >
> > Cc: Linus Walleij <linus.walleij@linaro.org>
> > Cc: Alexandre Courbot <gnurou@gmail.com>
> > Cc: linux-gpio@vger.kernel.org
> > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> 
> Patch applied for v3.15.

Yet that patch is in linux-next today.  And just 2 days ago I mailed out this request (as I do during each merge window):

"Please do not add any code intended for v3.15 to your linux-next included
trees until after v3.14-rc1 has been released."

I have no problem with that particular patch being sent to Linus during
this merge window (in fact Paul intends to send whatever is left of the
series at the end of the merge window), but it makes me wonder about the
other commits that you have added to the gpio tree (and the pinctrl tree)
today.  Are they intended for this merge window or v3.15?
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 59/73] drivers/gpio: delete non-required instances of include <linux/init.h>

[Paul Gortmaker]

[Re: [PATCH 59/73] drivers/gpio: delete non-required instances of include <linux/init.h>] On 24/01/2014 (Fri 09:58) Stephen Rothwell wrote:

> Hi Linus,
> 
> On Thu, 23 Jan 2014 09:12:43 +0100 Linus Walleij <linus.walleij@linaro.org> wrote:
> >
> > On Tue, Jan 21, 2014 at 10:23 PM, Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
> > 
> > > 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.
> > >
> > > Cc: Linus Walleij <linus.walleij@linaro.org>
> > > Cc: Alexandre Courbot <gnurou@gmail.com>
> > > Cc: linux-gpio@vger.kernel.org
> > > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> > 
> > Patch applied for v3.15.
> 
> Yet that patch is in linux-next today.  And just 2 days ago I mailed out this request (as I do during each merge window):
> 
> "Please do not add any code intended for v3.15 to your linux-next included
> trees until after v3.14-rc1 has been released."
> 
> I have no problem with that particular patch being sent to Linus during
> this merge window (in fact Paul intends to send whatever is left of the
> series at the end of the merge window), but it makes me wonder about the
> other commits that you have added to the gpio tree (and the pinctrl tree)
> today.  Are they intended for this merge window or v3.15?

For what it is worth, I'm not removing any patches from my series file
until they explicitly conflict and/or become redundant.  If a maintainer
says they are adding the patch, I add a comment in the series file, but
I don't remove them until I see them come into next via another branch,
and/or sfr reports a conflict/redundancy.

Thanks,
Paul.
--

> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au

Re: [PATCH 59/73] drivers/gpio: delete non-required instances of include <linux/init.h>

[Linus Walleij]

On Thu, Jan 23, 2014 at 11:58 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> I have no problem with that particular patch being sent to Linus during
> this merge window (in fact Paul intends to send whatever is left of the
> series at the end of the merge window), but it makes me wonder about the
> other commits that you have added to the gpio tree (and the pinctrl tree)
> today.  Are they intended for this merge window or v3.15?

Sorry, my bad. I took this out now and I have a much smaller/stricter
subset of patches in for-next today.

Yours,
Linus Walleij

Re: [PATCH 59/73] drivers/gpio: delete non-required instances of include <linux/init.h>

[Linus Walleij]

On Fri, Jan 24, 2014 at 3:21 AM, Paul Gortmaker
<paul.gortmaker@windriver.com> wrote:

> For what it is worth, I'm not removing any patches from my series file
> until they explicitly conflict and/or become redundant.  If a maintainer
> says they are adding the patch, I add a comment in the series file, but
> I don't remove them until I see them come into next via another branch,
> and/or sfr reports a conflict/redundancy.

So I can add these patches to my devel branches now I think?

Yours,
Linus Walleij

Re: [PATCH 59/73] drivers/gpio: delete non-required instances of include <linux/init.h>

[Paul Gortmaker]

On 14-02-05 08:02 AM, Linus Walleij wrote:
> On Fri, Jan 24, 2014 at 3:21 AM, Paul Gortmaker
> <paul.gortmaker@windriver.com> wrote:
> 
>> For what it is worth, I'm not removing any patches from my series file
>> until they explicitly conflict and/or become redundant.  If a maintainer
>> says they are adding the patch, I add a comment in the series file, but
>> I don't remove them until I see them come into next via another branch,
>> and/or sfr reports a conflict/redundancy.
> 
> So I can add these patches to my devel branches now I think?

The patches that weren't taken by maintainers before 3.14-rc1 were
encompassed in the cleanup pull request to Linus sent yesterday.

http://www.spinics.net/lists/arm-kernel/msg304864.html

So, assuming he does pull it, you'll not have to do anything.

Thanks,
Paul.
--

> 
> Yours,
> Linus Walleij
> 

Re: [PATCH 59/73] drivers/gpio: delete non-required instances of include <linux/init.h>

[Linus Walleij]

On Wed, Feb 5, 2014 at 4:00 PM, Paul Gortmaker
<paul.gortmaker@windriver.com> wrote:
> On 14-02-05 08:02 AM, Linus Walleij wrote:

>> So I can add these patches to my devel branches now I think?
>
> The patches that weren't taken by maintainers before 3.14-rc1 were
> encompassed in the cleanup pull request to Linus sent yesterday.

Sweet! Thanks Paul.

Yours,
Linus Walleij