diff mbox

gpio/mxc/mxs: fix build error introduced by the reanming of irq_gc_ack()

Message ID 1311046444-25423-1-git-send-email-shawn.guo@linaro.org
State New
Headers show

Commit Message

Shawn Guo July 19, 2011, 3:34 a.m. UTC
The following commit renames irq_gc_ack() to irq_gc_ack_set_bit(),
and makes gpio-mxc and gpio-mxs fail to build.

  659fb32d1b67476f4ade25e9ea0e2642a5b9c4b5
  genirq: replace irq_gc_ack() with {set,clr}_bit variants (fwd)

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
The build error is being seen on linux-next.

 drivers/gpio/gpio-mxc.c |    2 +-
 drivers/gpio/gpio-mxs.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Sergei Shtylyov July 19, 2011, 12:38 p.m. UTC | #1
Hello.

On 19-07-2011 7:34, Shawn Guo wrote:

> The following commit renames irq_gc_ack() to irq_gc_ack_set_bit(),
> and makes gpio-mxc and gpio-mxs fail to build.

>    659fb32d1b67476f4ade25e9ea0e2642a5b9c4b5
>    genirq: replace irq_gc_ack() with {set,clr}_bit variants (fwd)

> Signed-off-by: Shawn Guo<shawn.guo@linaro.org>
> ---
> The build error is being seen on linux-next.

>   drivers/gpio/gpio-mxc.c |    2 +-
>   drivers/gpio/gpio-mxs.c |    2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)

> diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c
> index 89fda58..4a46fbe 100644
> --- a/drivers/gpio/gpio-mxc.c
> +++ b/drivers/gpio/gpio-mxc.c
> @@ -297,7 +297,7 @@ static void __init mxc_gpio_init_gc(struct mxc_gpio_port *port)
>   	gc->private = port;
>
>   	ct = gc->chip_types;
> -	ct->chip.irq_ack = irq_gc_ack,
> +	ct->chip.irq_ack = irq_gc_ack_set_bit,

    There should be semicolon rathern than comma at the end.

>   	ct->chip.irq_mask = irq_gc_mask_clr_bit;
>   	ct->chip.irq_unmask = irq_gc_mask_set_bit;
>   	ct->chip.irq_set_type = gpio_set_irq_type;
> diff --git a/drivers/gpio/gpio-mxs.c b/drivers/gpio/gpio-mxs.c
> index d8cafba..88f8506 100644
> --- a/drivers/gpio/gpio-mxs.c
> +++ b/drivers/gpio/gpio-mxs.c
> @@ -156,7 +156,7 @@ static void __init mxs_gpio_init_gc(struct mxs_gpio_port *port)
>   	gc->private = port;
>
>   	ct = gc->chip_types;
> -	ct->chip.irq_ack = irq_gc_ack,
> +	ct->chip.irq_ack = irq_gc_ack_set_bit,

    Same here.

WBR, Sergei
Shawn Guo July 19, 2011, 12:59 p.m. UTC | #2
On Tue, Jul 19, 2011 at 04:38:37PM +0400, Sergei Shtylyov wrote:
> Hello.
> 
> On 19-07-2011 7:34, Shawn Guo wrote:
> 
> >The following commit renames irq_gc_ack() to irq_gc_ack_set_bit(),
> >and makes gpio-mxc and gpio-mxs fail to build.
> 
> >   659fb32d1b67476f4ade25e9ea0e2642a5b9c4b5
> >   genirq: replace irq_gc_ack() with {set,clr}_bit variants (fwd)
> 
> >Signed-off-by: Shawn Guo<shawn.guo@linaro.org>
> >---
> >The build error is being seen on linux-next.
> 
> >  drivers/gpio/gpio-mxc.c |    2 +-
> >  drivers/gpio/gpio-mxs.c |    2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> >diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c
> >index 89fda58..4a46fbe 100644
> >--- a/drivers/gpio/gpio-mxc.c
> >+++ b/drivers/gpio/gpio-mxc.c
> >@@ -297,7 +297,7 @@ static void __init mxc_gpio_init_gc(struct mxc_gpio_port *port)
> >  	gc->private = port;
> >
> >  	ct = gc->chip_types;
> >-	ct->chip.irq_ack = irq_gc_ack,
> >+	ct->chip.irq_ack = irq_gc_ack_set_bit,
> 
>    There should be semicolon rathern than comma at the end.
> 
Thanks, Sergei.  I'm pretty surprised that gcc did not help me there.

Regards,
Shawn

> >  	ct->chip.irq_mask = irq_gc_mask_clr_bit;
> >  	ct->chip.irq_unmask = irq_gc_mask_set_bit;
> >  	ct->chip.irq_set_type = gpio_set_irq_type;
> >diff --git a/drivers/gpio/gpio-mxs.c b/drivers/gpio/gpio-mxs.c
> >index d8cafba..88f8506 100644
> >--- a/drivers/gpio/gpio-mxs.c
> >+++ b/drivers/gpio/gpio-mxs.c
> >@@ -156,7 +156,7 @@ static void __init mxs_gpio_init_gc(struct mxs_gpio_port *port)
> >  	gc->private = port;
> >
> >  	ct = gc->chip_types;
> >-	ct->chip.irq_ack = irq_gc_ack,
> >+	ct->chip.irq_ack = irq_gc_ack_set_bit,
> 
>    Same here.
> 
> WBR, Sergei
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>
Uwe Kleine-König July 19, 2011, 3:23 p.m. UTC | #3
Hello Shawn,

> > >  	ct = gc->chip_types;
> > >-	ct->chip.irq_ack = irq_gc_ack,
> > >+	ct->chip.irq_ack = irq_gc_ack_set_bit,
> > 
> >    There should be semicolon rathern than comma at the end.
> > 
> Thanks, Sergei.  I'm pretty surprised that gcc did not help me there.
> > >  	ct->chip.irq_mask = irq_gc_mask_clr_bit;
That's because using a comma is valid C, too.
It just assigns ct->chip.irq_ack as a side effect of the
expression

	ct->chip.irq_ack = irq_gc_ack_set_bit, ct->chip.irq_unmask = irq_gc_mask_set_bit;

Best regards
Uwe
diff mbox

Patch

diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c
index 89fda58..4a46fbe 100644
--- a/drivers/gpio/gpio-mxc.c
+++ b/drivers/gpio/gpio-mxc.c
@@ -297,7 +297,7 @@  static void __init mxc_gpio_init_gc(struct mxc_gpio_port *port)
 	gc->private = port;
 
 	ct = gc->chip_types;
-	ct->chip.irq_ack = irq_gc_ack,
+	ct->chip.irq_ack = irq_gc_ack_set_bit,
 	ct->chip.irq_mask = irq_gc_mask_clr_bit;
 	ct->chip.irq_unmask = irq_gc_mask_set_bit;
 	ct->chip.irq_set_type = gpio_set_irq_type;
diff --git a/drivers/gpio/gpio-mxs.c b/drivers/gpio/gpio-mxs.c
index d8cafba..88f8506 100644
--- a/drivers/gpio/gpio-mxs.c
+++ b/drivers/gpio/gpio-mxs.c
@@ -156,7 +156,7 @@  static void __init mxs_gpio_init_gc(struct mxs_gpio_port *port)
 	gc->private = port;
 
 	ct = gc->chip_types;
-	ct->chip.irq_ack = irq_gc_ack,
+	ct->chip.irq_ack = irq_gc_ack_set_bit,
 	ct->chip.irq_mask = irq_gc_mask_clr_bit;
 	ct->chip.irq_unmask = irq_gc_mask_set_bit;
 	ct->chip.irq_set_type = mxs_gpio_set_irq_type;