diff mbox series

gpio: sa1100: include <mach/generic.h>

Message ID 20230516201642.557733-1-arnd@kernel.org
State New
Headers
Series gpio: sa1100: include <mach/generic.h> |

Commit Message

Arnd Bergmann May 16, 2023, 8:16 p.m. UTC 
  From: Arnd Bergmann <arnd@arndb.de>

sa1100_init_gpio() is declared in a machine specific header so it
can be called from platform code, but the definition is in the device
driver, which causes a warning:

drivers/gpio/gpio-sa1100.c:310:13: error: no previous prototype for 'sa1100_init_gpio' [-Werror=missing-prototypes]

It's already possible to include mach/generic.h from drivers, so add
this one here as well.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/gpio/gpio-sa1100.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Bartosz Golaszewski May 17, 2023, 9:33 a.m. UTC | #1 
On Tue, May 16, 2023 at 10:16 PM Arnd Bergmann <arnd@kernel.org> wrote:
>
> From: Arnd Bergmann <arnd@arndb.de>
>
> sa1100_init_gpio() is declared in a machine specific header so it
> can be called from platform code, but the definition is in the device
> driver, which causes a warning:
>
> drivers/gpio/gpio-sa1100.c:310:13: error: no previous prototype for 'sa1100_init_gpio' [-Werror=missing-prototypes]
>
> It's already possible to include mach/generic.h from drivers, so add
> this one here as well.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  drivers/gpio/gpio-sa1100.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpio/gpio-sa1100.c b/drivers/gpio/gpio-sa1100.c
> index 342a59ea489a..3b1cc8462fcb 100644
> --- a/drivers/gpio/gpio-sa1100.c
> +++ b/drivers/gpio/gpio-sa1100.c
> @@ -13,6 +13,7 @@
>  #include <mach/hardware.h>
>  #include <mach/regs-gpio.h>

This doesn't apply on top of my branch (neither on next) because of
this line. I can't see where this was added. Any hint?

Bart

>  #include <mach/irqs.h>
> +#include <mach/generic.h>
>
>  struct sa1100_gpio_chip {
>         struct gpio_chip chip;
> --
> 2.39.2
>
Arnd Bergmann May 17, 2023, 9:51 a.m. UTC | #2 
On Wed, May 17, 2023, at 11:33, Bartosz Golaszewski wrote:
> On Tue, May 16, 2023 at 10:16 PM Arnd Bergmann <arnd@kernel.org> wrote:
>>
>> From: Arnd Bergmann <arnd@arndb.de>
>>
>> sa1100_init_gpio() is declared in a machine specific header so it
>> can be called from platform code, but the definition is in the device
>> driver, which causes a warning:
>>
>> drivers/gpio/gpio-sa1100.c:310:13: error: no previous prototype for 'sa1100_init_gpio' [-Werror=missing-prototypes]
>>
>> It's already possible to include mach/generic.h from drivers, so add
>> this one here as well.
>>
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>> ---
>>  drivers/gpio/gpio-sa1100.c | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/drivers/gpio/gpio-sa1100.c b/drivers/gpio/gpio-sa1100.c
>> index 342a59ea489a..3b1cc8462fcb 100644
>> --- a/drivers/gpio/gpio-sa1100.c
>> +++ b/drivers/gpio/gpio-sa1100.c
>> @@ -13,6 +13,7 @@
>>  #include <mach/hardware.h>
>>  #include <mach/regs-gpio.h>
>
> This doesn't apply on top of my branch (neither on next) because of
> this line. I can't see where this was added. Any hint?

My mistake, my working tree had some experimental patches in it.

I'll send a v2.

    Arnd
diff mbox series

Patch

diff --git a/drivers/gpio/gpio-sa1100.c b/drivers/gpio/gpio-sa1100.c
index 342a59ea489a..3b1cc8462fcb 100644
--- a/drivers/gpio/gpio-sa1100.c
+++ b/drivers/gpio/gpio-sa1100.c
@@ -13,6 +13,7 @@ 
 #include <mach/hardware.h>
 #include <mach/regs-gpio.h>
 #include <mach/irqs.h>
+#include <mach/generic.h>
 
 struct sa1100_gpio_chip {
 	struct gpio_chip chip;