diff mbox

[v2] gpiolib: Add stubs for gpiod lookup table interface

Message ID 1493275956-14759-1-git-send-email-agust@denx.de
State New
Headers show

Commit Message

Anatolij Gustschin April 27, 2017, 6:52 a.m. UTC 
Add stubs for gpiod_add_lookup_table() and gpiod_remove_lookup_table()
for the !GPIOLIB case to prevent build errors. Also add prototypes.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
Changes in v2:
 move gpiod_lookup_table out of #ifdef

 include/linux/gpio/consumer.h | 13 +++++++++++++
 1 file changed, 13 insertions(+)

Comments

Andy Shevchenko April 27, 2017, 2:07 p.m. UTC | #1 
On Thu, Apr 27, 2017 at 9:52 AM, Anatolij Gustschin <agust@denx.de> wrote:
> Add stubs for gpiod_add_lookup_table() and gpiod_remove_lookup_table()
> for the !GPIOLIB case to prevent build errors. Also add prototypes.
>
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>

Oh, has to take my tag back. See below why.


> --- a/include/linux/gpio/consumer.h
> +++ b/include/linux/gpio/consumer.h

It is already defined in machine.h.

What you basically need is to add stubs for !GPIOLIB case

#ifdef ...
...existing prototypes...
#else /* GPIOLIB */
static inline void gpiod_add_lookup_table(struct gpiod_lookup_table *table) {}
static inline void gpiod_remove_lookup_table(struct gpiod_lookup_table
*table) {}
#endif /* !GPIOLIB */

P.S. please notice how I put the stubs. It would be good to keep them
in two lines.
Anatolij Gustschin April 27, 2017, 2:25 p.m. UTC | #2 
On Thu, 27 Apr 2017 17:07:23 +0300
Andy Shevchenko andy.shevchenko@gmail.com wrote:

>On Thu, Apr 27, 2017 at 9:52 AM, Anatolij Gustschin <agust@denx.de> wrote:
>> Add stubs for gpiod_add_lookup_table() and gpiod_remove_lookup_table()
>> for the !GPIOLIB case to prevent build errors. Also add prototypes.
>>
>> Signed-off-by: Anatolij Gustschin <agust@denx.de>
>> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>  
>
>Oh, has to take my tag back. See below why.
>
>
>> --- a/include/linux/gpio/consumer.h
>> +++ b/include/linux/gpio/consumer.h  
>
>It is already defined in machine.h.
>
>What you basically need is to add stubs for !GPIOLIB case
>
>#ifdef ...
>...existing prototypes...
>#else /* GPIOLIB */
>static inline void gpiod_add_lookup_table(struct gpiod_lookup_table *table) {}
>static inline void gpiod_remove_lookup_table(struct gpiod_lookup_table
>*table) {}
>#endif /* !GPIOLIB */
>
>P.S. please notice how I put the stubs. It would be good to keep them
>in two lines.

this will exceed 80 char line limit.

Thanks,

Anatolij
--
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
Anatolij Gustschin April 27, 2017, 2:29 p.m. UTC | #3 
On Thu, 27 Apr 2017 16:25:34 +0200
Anatolij Gustschin agust@denx.de wrote:

>On Thu, 27 Apr 2017 17:07:23 +0300
>Andy Shevchenko andy.shevchenko@gmail.com wrote:
...
>>static inline void gpiod_add_lookup_table(struct gpiod_lookup_table *table) {}
>>static inline void gpiod_remove_lookup_table(struct gpiod_lookup_table
>>*table) {}
>>#endif /* !GPIOLIB */
>>
>>P.S. please notice how I put the stubs. It would be good to keep them
>>in two lines.  
>
>this will exceed 80 char line limit.

I'll go with

static inline 
void gpiod_add_lookup_table(struct gpiod_lookup_table *table) {}

static inline
void gpiod_remove_lookup_table(struct gpiod_lookup_table *table) {}

Is it okay?

Thanks,

Anatolij
--
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
Andy Shevchenko April 27, 2017, 2:47 p.m. UTC | #4 
On Thu, Apr 27, 2017 at 5:29 PM, Anatolij Gustschin <agust@denx.de> wrote:
> On Thu, 27 Apr 2017 16:25:34 +0200
> Anatolij Gustschin agust@denx.de wrote:
>
>>On Thu, 27 Apr 2017 17:07:23 +0300
>>Andy Shevchenko andy.shevchenko@gmail.com wrote:
> ...
>>>static inline void gpiod_add_lookup_table(struct gpiod_lookup_table *table) {}
>>>static inline void gpiod_remove_lookup_table(struct gpiod_lookup_table
>>>*table) {}
>>>#endif /* !GPIOLIB */
>>>
>>>P.S. please notice how I put the stubs. It would be good to keep them
>>>in two lines.
>>
>>this will exceed 80 char line limit.

Not for many (unimportant) symbols.

> I'll go with
>
> static inline
> void gpiod_add_lookup_table(struct gpiod_lookup_table *table) {}
>
> static inline
> void gpiod_remove_lookup_table(struct gpiod_lookup_table *table) {}
>
> Is it okay?

Whatever Linus prefers. I'm fine with either.
diff mbox

Patch

diff --git a/include/linux/gpio/consumer.h b/include/linux/gpio/consumer.h
index 8f702fc..f4a3fed 100644
--- a/include/linux/gpio/consumer.h
+++ b/include/linux/gpio/consumer.h
@@ -41,6 +41,8 @@  enum gpiod_flags {
 			  GPIOD_FLAGS_BIT_DIR_VAL,
 };
 
+struct gpiod_lookup_table;
+
 #ifdef CONFIG_GPIOLIB
 
 /* Return the number of GPIOs associated with a device / function */
@@ -144,6 +146,9 @@  struct gpio_desc *devm_fwnode_get_index_gpiod_from_child(struct device *dev,
 						enum gpiod_flags flags,
 						const char *label);
 
+void gpiod_add_lookup_table(struct gpiod_lookup_table *table);
+void gpiod_remove_lookup_table(struct gpiod_lookup_table *table);
+
 #else /* CONFIG_GPIOLIB */
 
 static inline int gpiod_count(struct device *dev, const char *con_id)
@@ -435,6 +440,14 @@  struct gpio_desc *devm_fwnode_get_index_gpiod_from_child(struct device *dev,
 	return ERR_PTR(-ENOSYS);
 }
 
+static inline void gpiod_add_lookup_table(struct gpiod_lookup_table *table)
+{
+}
+
+static inline void gpiod_remove_lookup_table(struct gpiod_lookup_table *table)
+{
+}
+
 #endif /* CONFIG_GPIOLIB */
 
 static inline