[PATCH] gpio: Remove superfluous include of io-mapping.h

[PATCH] gpio: Remove superfluous include of io-mapping.h

[Chris Wilson]

The io-mapping.h include arose from the need to workaround an arch/um
compile failure:

   drivers/gpio/gpio-mpc8xxx.c: In function 'mpc8xxx_probe':
>> drivers/gpio/gpio-mpc8xxx.c:373:2: error: implicit declaration of
>> function 'iounmap' [-Werror=implicit-function-declaration]
     iounmap(mpc8xxx_gc->regs);
     ^~~~~~~

from commit 296ad4acb8ef ("gpio: remove deps on
ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB") but io-mapping.h doesn't provide
iounmap so the problem persisted and eventually (will be) silenced by
making OF_GPIO depend on !NO_IOMEM (i.e. disabling building under
arch/um). My desire to remove the unneed include to io-mapping is to
simplify verification of changes to io-mapping.h

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Alexandre Courbot <gnurou@gmail.com>
Cc: linux-gpio@vger.kernel.org
---
 drivers/gpio/gpiolib-of.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
index 75e7b3919ea7..a28feb3edf33 100644
--- a/drivers/gpio/gpiolib-of.c
+++ b/drivers/gpio/gpiolib-of.c
@@ -16,7 +16,6 @@
 #include <linux/errno.h>
 #include <linux/module.h>
 #include <linux/io.h>
-#include <linux/io-mapping.h>
 #include <linux/gpio/consumer.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
-- 
2.9.3

Re: [PATCH] gpio: Remove superfluous include of io-mapping.h

[Linus Walleij]

On Tue, Aug 23, 2016 at 10:32 PM, Chris Wilson <chris@chris-wilson.co.uk> wrote:

> The io-mapping.h include arose from the need to workaround an arch/um
> compile failure:
>
>    drivers/gpio/gpio-mpc8xxx.c: In function 'mpc8xxx_probe':
>>> drivers/gpio/gpio-mpc8xxx.c:373:2: error: implicit declaration of
>>> function 'iounmap' [-Werror=implicit-function-declaration]
>      iounmap(mpc8xxx_gc->regs);
>      ^~~~~~~
>
> from commit 296ad4acb8ef ("gpio: remove deps on
> ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB") but io-mapping.h doesn't provide
> iounmap so the problem persisted and eventually (will be) silenced by
> making OF_GPIO depend on !NO_IOMEM (i.e. disabling building under
> arch/um). My desire to remove the unneed include to io-mapping is to
> simplify verification of changes to io-mapping.h
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Alexandre Courbot <gnurou@gmail.com>
> Cc: linux-gpio@vger.kernel.org

I chose to to a proper revert instead, but I have added your for
Reported-by:

Thanks a lot.

Yours,
Linus Walleij

Re: [PATCH] gpio: Remove superfluous include of io-mapping.h

[Chris Wilson]

On Wed, Aug 24, 2016 at 01:55:28PM +0200, Linus Walleij wrote:
> On Tue, Aug 23, 2016 at 10:32 PM, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> 
> > The io-mapping.h include arose from the need to workaround an arch/um
> > compile failure:
> >
> >    drivers/gpio/gpio-mpc8xxx.c: In function 'mpc8xxx_probe':
> >>> drivers/gpio/gpio-mpc8xxx.c:373:2: error: implicit declaration of
> >>> function 'iounmap' [-Werror=implicit-function-declaration]
> >      iounmap(mpc8xxx_gc->regs);
> >      ^~~~~~~
> >
> > from commit 296ad4acb8ef ("gpio: remove deps on
> > ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB") but io-mapping.h doesn't provide
> > iounmap so the problem persisted and eventually (will be) silenced by
> > making OF_GPIO depend on !NO_IOMEM (i.e. disabling building under
> > arch/um). My desire to remove the unneed include to io-mapping is to
> > simplify verification of changes to io-mapping.h
> >
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Linus Walleij <linus.walleij@linaro.org>
> > Cc: Alexandre Courbot <gnurou@gmail.com>
> > Cc: linux-gpio@vger.kernel.org
> 
> I chose to to a proper revert instead, but I have added your for
> Reported-by:

Thanks, this will help me hide from 0day as well :)
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre