gpio: always include linux/gpio/consumer.h in linux/gpio.h

Message ID 20171114114002.234250-1-arnd@arndb.de
State New
Headers show
Series
  • gpio: always include linux/gpio/consumer.h in linux/gpio.h
Related show

Commit Message

Arnd Bergmann Nov. 14, 2017, 11:39 a.m.
linux/gpio/consumer.h is a bit odd, it contains definitions for a number
of the advanced gpio interfaces, in variants for both gpiolib-based
platforms and those not using gpiolib.

The file gets included implicitly by linux/gpio.h, but only if gpiolib
is enabled. Driver writers regularly fail to notice this and include
the top-level linux/gpio.h but use the newer interfaces.

The latest such driver is a new touchscreen driver that produced this
build failure on an x86 randconfig build:

drivers/input/touchscreen/hideep.c: In function 'hideep_power_on':
drivers/input/touchscreen/hideep.c:670:3: error: implicit declaration of function 'gpiod_set_value_cansleep'; did you mean 'gpio_set_value_cansleep'? [-Werror=implicit-function-declaration]
   gpiod_set_value_cansleep(ts->reset_gpio, 0);

I don't want to manually add linux/gpio/consumer.h inclusions to each
such file any more, so let's just include this in linux/gpio.h for everyone.

Fixes: 842ff286166e ("Input: add support for HiDeep touchscreen")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 include/linux/gpio.h | 1 +
 1 file changed, 1 insertion(+)

Comments

Linus Walleij Nov. 15, 2017, 7:43 a.m. | #1
On Tue, Nov 14, 2017 at 12:39 PM, Arnd Bergmann <arnd@arndb.de> wrote:

> linux/gpio/consumer.h is a bit odd, it contains definitions for a number
> of the advanced gpio interfaces, in variants for both gpiolib-based
> platforms and those not using gpiolib.
>
> The file gets included implicitly by linux/gpio.h, but only if gpiolib
> is enabled. Driver writers regularly fail to notice this and include
> the top-level linux/gpio.h but use the newer interfaces.
>
> The latest such driver is a new touchscreen driver that produced this
> build failure on an x86 randconfig build:
>
> drivers/input/touchscreen/hideep.c: In function 'hideep_power_on':
> drivers/input/touchscreen/hideep.c:670:3: error: implicit declaration of function 'gpiod_set_value_cansleep'; did you mean 'gpio_set_value_cansleep'? [-Werror=implicit-function-declaration]
>    gpiod_set_value_cansleep(ts->reset_gpio, 0);
>
> I don't want to manually add linux/gpio/consumer.h inclusions to each
> such file any more, so let's just include this in linux/gpio.h for everyone.

Consumers should really just use <linux/gpio/consumer.h>
and stop including <linux/gpio.h> at all.

<linux/gpio.h> does not have the producer/consumer split
that the new API has, and the latter was inspired by
<linux/regulator/driver.h> and <linux/regulator/machine.h>
etc.

I.e. the right fix is not just to add #include <linux/gpio/consumer.h>
but also *delete* #include <linux/gpio.h>

The only time a driver need both includes is when they
use the legacy GPIO API and the new consumer API
at the same time. Or if they both produce and consume
GPIOs (such as some GPIO drivers do).

I don't know what to do besides documenting it, and it is
documented clearly in:
Documentation/gpio/consumer.txt

Apparently people write their drivers for GPIO without reading
this documentation and just including random headers or
copy-pasting.

I am trying to make more drivers good examples, one at a
time, starting with the most important and used ones.
drivers/gpio/busses/i2c-gpio.c is the most recent cleanup.

We can't delete the inclusion of <linux/gpio/consumer.h> from
<linux/gpio.h> however much we wanted to, because it breaks
a ton of legacy code. Instead we move one step at the time.

What we *could* do is try to emit a build warning for drivers
that use the implicit include of <linux/gpio/consumer.h>
from <linux/gpio.h>.

Or add some code to checkpatch to scream about it.

Ideas?

Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Arnd Bergmann Nov. 15, 2017, 9:12 a.m. | #2
On Wed, Nov 15, 2017 at 8:43 AM, Linus Walleij <linus.walleij@linaro.org> wrote:
> On Tue, Nov 14, 2017 at 12:39 PM, Arnd Bergmann <arnd@arndb.de> wrote:
>
>> linux/gpio/consumer.h is a bit odd, it contains definitions for a number
>> of the advanced gpio interfaces, in variants for both gpiolib-based
>> platforms and those not using gpiolib.
>>
>> The file gets included implicitly by linux/gpio.h, but only if gpiolib
>> is enabled. Driver writers regularly fail to notice this and include
>> the top-level linux/gpio.h but use the newer interfaces.
>>
>> The latest such driver is a new touchscreen driver that produced this
>> build failure on an x86 randconfig build:
>>
>> drivers/input/touchscreen/hideep.c: In function 'hideep_power_on':
>> drivers/input/touchscreen/hideep.c:670:3: error: implicit declaration of function 'gpiod_set_value_cansleep'; did you mean 'gpio_set_value_cansleep'? [-Werror=implicit-function-declaration]
>>    gpiod_set_value_cansleep(ts->reset_gpio, 0);
>>
>> I don't want to manually add linux/gpio/consumer.h inclusions to each
>> such file any more, so let's just include this in linux/gpio.h for everyone.
>
> Consumers should really just use <linux/gpio/consumer.h>
> and stop including <linux/gpio.h> at all.
>
> <linux/gpio.h> does not have the producer/consumer split
> that the new API has, and the latter was inspired by
> <linux/regulator/driver.h> and <linux/regulator/machine.h>
> etc.
>
> I.e. the right fix is not just to add #include <linux/gpio/consumer.h>
> but also *delete* #include <linux/gpio.h>

Ok.

> The only time a driver need both includes is when they
> use the legacy GPIO API and the new consumer API
> at the same time. Or if they both produce and consume
> GPIOs (such as some GPIO drivers do).
>
> I don't know what to do besides documenting it, and it is
> documented clearly in:
> Documentation/gpio/consumer.txt
>
> Apparently people write their drivers for GPIO without reading
> this documentation and just including random headers or
> copy-pasting.

Yes, this is usually the case, also a good rule is that people
will (and should) use the simplest API available. In case
of the header file that in turn means that they will go for
linux/gpio.h over linux/gpio/consumer.h if both appear to
work equally well. The rest of the kernel API has trained
us to think that way.

> I am trying to make more drivers good examples, one at a
> time, starting with the most important and used ones.
> drivers/gpio/busses/i2c-gpio.c is the most recent cleanup.
>
> We can't delete the inclusion of <linux/gpio/consumer.h> from
> <linux/gpio.h> however much we wanted to, because it breaks
> a ton of legacy code. Instead we move one step at the time.
>
> What we *could* do is try to emit a build warning for drivers
> that use the implicit include of <linux/gpio/consumer.h>
> from <linux/gpio.h>.
>
> Or add some code to checkpatch to scream about it.
>
> Ideas?

I think a good step forward would be to make it clearer
from looking at linux/gpio.h what that file is for, since it
is used for a couple of different things at the moment.

It should be easy to split it up into e.g. linux/gpio/common.h
for the flags, linux/gpio/legacy-consumer.h for the parts
that just use the old gpio_* functions, plus maybe
linux/gpio/legacy-driver.h if that helps (probably not).

Once linux/gpio.h contains nothing else but e.g.

#include <linux/gpio/consumer.h>
#include <linux/gpio/legacy-consumer.h>
#include <linux/gpio/driver.h>

and some comments, that improves the chances that
people pick the right header after looking at the global one.
Ideally the three or four headers you use should not
include each other, but

It might also help to add a shorter linux/gpiod.h
in place of linux/gpio/consumer.h and let new drivers use
that instead.

Once the structure is in place (in whichever form), we can
start warning in checkpatch.pl for any inclusion of
linux/gpio.h, and do automated conversions, e.g. one
patch per subsystem, to move drivers over from
linux/gpio.h to linux/gpio/legacy-consumer.h. The
new longer name should also make it clear to driver
writers that they use the wrong interface ;-)

Getting the linux/gpio/driver.h stuff out of linux/gpio.h
is probably easier still, but also also less important.

    Arnd
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/include/linux/gpio.h b/include/linux/gpio.h
index 8ef7fc0ce0f0..7f6c6d31949f 100644
--- a/include/linux/gpio.h
+++ b/include/linux/gpio.h
@@ -89,6 +89,7 @@  void devm_gpio_free(struct device *dev, unsigned int gpio);
 
 #else /* ! CONFIG_GPIOLIB */
 
+#include <linux/gpio/consumer.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/bug.h>