2010-01-23 21:02:28

by Uwe Kleine-König

Subject: [PATCH 2/2] omap: define _toggle_gpio_edge_triggering only for OMAP1

The only usage of _toggle_gpio_edge_triggering is in an
CONFIG_ARCH_OMAP1 is defined, too.

This fixes a compiler warning:

arch/arm/plat-omap/gpio.c:758: warning: '_toggle_gpio_edge_triggering' defined but not used

when compiling for ARCH_OMAP2, ARCH_OMAP3 or ARCH_OMAP4.

Signed-off-by: Uwe Kleine-König <[email protected]>
---
arch/arm/plat-omap/gpio.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index d17620c..d2422c7 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -750,6 +750,7 @@ static inline void set_24xx_gpio_triggering(struct gpio_bank *bank, int gpio,
}
#endif

+#ifdef CONFIG_ARCH_OMAP1
/*
* This only applies to chips that can't do both rising and falling edge
* detection at once. For all other chips, this function is a noop.
@@ -760,11 +761,9 @@ static void _toggle_gpio_edge_triggering(struct gpio_bank *bank, int gpio)
u32 l = 0;

switch (bank->method) {
-#ifdef CONFIG_ARCH_OMAP1
case METHOD_MPUIO:
reg += OMAP_MPUIO_GPIO_INT_EDGE;
break;
-#endif
#ifdef CONFIG_ARCH_OMAP15XX
case METHOD_GPIO_1510:
reg += OMAP1510_GPIO_INT_CONTROL;
@@ -787,6 +786,7 @@ static void _toggle_gpio_edge_triggering(struct gpio_bank *bank, int gpio)

__raw_writel(l, reg);
}
+#endif

static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger)
{
--
1.6.6

2010-01-25 18:23:14

by Kevin Hilman

Subject: Re: [PATCH 2/2] omap: define _toggle_gpio_edge_triggering only for OMAP1

Uwe Kleine-K?nig <[email protected]> writes:

> The only usage of _toggle_gpio_edge_triggering is in an
> CONFIG_ARCH_OMAP1 is defined, too.
>
> This fixes a compiler warning:
>
> arch/arm/plat-omap/gpio.c:758: warning: '_toggle_gpio_edge_triggering' defined but not used
>
> when compiling for ARCH_OMAP2, ARCH_OMAP3 or ARCH_OMAP4.
>
> Signed-off-by: Uwe Kleine-K?nig <[email protected]>

Acked-by: Kevin Hilman <[email protected]>

> ---
> arch/arm/plat-omap/gpio.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
> index d17620c..d2422c7 100644
> --- a/arch/arm/plat-omap/gpio.c
> +++ b/arch/arm/plat-omap/gpio.c
> @@ -750,6 +750,7 @@ static inline void set_24xx_gpio_triggering(struct gpio_bank *bank, int gpio,
> }
> #endif
>
> +#ifdef CONFIG_ARCH_OMAP1
> /*
> * This only applies to chips that can't do both rising and falling edge
> * detection at once. For all other chips, this function is a noop.
> @@ -760,11 +761,9 @@ static void _toggle_gpio_edge_triggering(struct gpio_bank *bank, int gpio)
> u32 l = 0;
>
> switch (bank->method) {
> -#ifdef CONFIG_ARCH_OMAP1
> case METHOD_MPUIO:
> reg += OMAP_MPUIO_GPIO_INT_EDGE;
> break;
> -#endif
> #ifdef CONFIG_ARCH_OMAP15XX
> case METHOD_GPIO_1510:
> reg += OMAP1510_GPIO_INT_CONTROL;
> @@ -787,6 +786,7 @@ static void _toggle_gpio_edge_triggering(struct gpio_bank *bank, int gpio)
>
> __raw_writel(l, reg);
> }
> +#endif
>
> static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger)
> {
> --
> 1.6.6

2010-01-26 00:28:48

by Tony Lindgren

Subject: Re: [PATCH 2/2] omap: define _toggle_gpio_edge_triggering only for OMAP1

* Kevin Hilman <[email protected]> [100125 10:20]:
> Uwe Kleine-König <[email protected]> writes:
>
> > The only usage of _toggle_gpio_edge_triggering is in an
> > CONFIG_ARCH_OMAP1 is defined, too.
> >
> > This fixes a compiler warning:
> >
> > arch/arm/plat-omap/gpio.c:758: warning: '_toggle_gpio_edge_triggering' defined but not used
> >
> > when compiling for ARCH_OMAP2, ARCH_OMAP3 or ARCH_OMAP4.
> >
> > Signed-off-by: Uwe Kleine-König <[email protected]>
>
> Acked-by: Kevin Hilman <[email protected]>

Ack, I'll add this into omap-fixes for the -rc cycle.

Regards,

Tony

> > ---
> > arch/arm/plat-omap/gpio.c | 4 ++--
> > 1 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
> > index d17620c..d2422c7 100644
> > --- a/arch/arm/plat-omap/gpio.c
> > +++ b/arch/arm/plat-omap/gpio.c
> > @@ -750,6 +750,7 @@ static inline void set_24xx_gpio_triggering(struct gpio_bank *bank, int gpio,
> > }
> > #endif
> >
> > +#ifdef CONFIG_ARCH_OMAP1
> > /*
> > * This only applies to chips that can't do both rising and falling edge
> > * detection at once. For all other chips, this function is a noop.
> > @@ -760,11 +761,9 @@ static void _toggle_gpio_edge_triggering(struct gpio_bank *bank, int gpio)
> > u32 l = 0;
> >
> > switch (bank->method) {
> > -#ifdef CONFIG_ARCH_OMAP1
> > case METHOD_MPUIO:
> > reg += OMAP_MPUIO_GPIO_INT_EDGE;
> > break;
> > -#endif
> > #ifdef CONFIG_ARCH_OMAP15XX
> > case METHOD_GPIO_1510:
> > reg += OMAP1510_GPIO_INT_CONTROL;
> > @@ -787,6 +786,7 @@ static void _toggle_gpio_edge_triggering(struct gpio_bank *bank, int gpio)
> >
> > __raw_writel(l, reg);
> > }
> > +#endif
> >
> > static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger)
> > {
> > --
> > 1.6.6