* [PATCH] gpio/mxc/mxs: fix build error introduced by the reanming of irq_gc_ack()
@ 2011-07-19 3:34 Shawn Guo
2011-07-19 12:38 ` Sergei Shtylyov
2011-07-19 13:16 ` [PATCH v2] gpio/mxc/mxs: fix build error introduced by the irq_gc_ack() renaming Shawn Guo
0 siblings, 2 replies; 6+ messages in thread
From: Shawn Guo @ 2011-07-19 3:34 UTC (permalink / raw)
To: linux-arm-kernel
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,
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;
--
1.7.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] gpio/mxc/mxs: fix build error introduced by the reanming of irq_gc_ack()
2011-07-19 3:34 [PATCH] gpio/mxc/mxs: fix build error introduced by the reanming of irq_gc_ack() Shawn Guo
@ 2011-07-19 12:38 ` Sergei Shtylyov
2011-07-19 12:59 ` Shawn Guo
2011-07-19 13:16 ` [PATCH v2] gpio/mxc/mxs: fix build error introduced by the irq_gc_ack() renaming Shawn Guo
1 sibling, 1 reply; 6+ messages in thread
From: Sergei Shtylyov @ 2011-07-19 12:38 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH] gpio/mxc/mxs: fix build error introduced by the reanming of irq_gc_ack()
2011-07-19 12:38 ` Sergei Shtylyov
@ 2011-07-19 12:59 ` Shawn Guo
2011-07-19 15:23 ` Uwe Kleine-König
0 siblings, 1 reply; 6+ messages in thread
From: Shawn Guo @ 2011-07-19 12:59 UTC (permalink / raw)
To: linux-arm-kernel
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 at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH] gpio/mxc/mxs: fix build error introduced by the reanming of irq_gc_ack()
2011-07-19 12:59 ` Shawn Guo
@ 2011-07-19 15:23 ` Uwe Kleine-König
0 siblings, 0 replies; 6+ messages in thread
From: Uwe Kleine-König @ 2011-07-19 15:23 UTC (permalink / raw)
To: linux-arm-kernel
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
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] gpio/mxc/mxs: fix build error introduced by the irq_gc_ack() renaming
2011-07-19 3:34 [PATCH] gpio/mxc/mxs: fix build error introduced by the reanming of irq_gc_ack() Shawn Guo
2011-07-19 12:38 ` Sergei Shtylyov
@ 2011-07-19 13:16 ` Shawn Guo
2011-07-19 19:10 ` Grant Likely
1 sibling, 1 reply; 6+ messages in thread
From: Shawn Guo @ 2011-07-19 13:16 UTC (permalink / raw)
To: linux-arm-kernel
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)
The patch fixed a couple of typo of comma to semicolon.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
Changes since v1:
* Fix a couple of typo of comma to semicolon
drivers/gpio/gpio-mxc.c | 4 ++--
drivers/gpio/gpio-mxs.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c
index 89fda58..4340aca 100644
--- a/drivers/gpio/gpio-mxc.c
+++ b/drivers/gpio/gpio-mxc.c
@@ -297,11 +297,11 @@ 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;
- ct->chip.irq_set_wake = gpio_set_wake_irq,
+ ct->chip.irq_set_wake = gpio_set_wake_irq;
ct->regs.ack = GPIO_ISR;
ct->regs.mask = GPIO_IMR;
diff --git a/drivers/gpio/gpio-mxs.c b/drivers/gpio/gpio-mxs.c
index d8cafba..af55a85 100644
--- a/drivers/gpio/gpio-mxs.c
+++ b/drivers/gpio/gpio-mxs.c
@@ -156,11 +156,11 @@ 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;
- ct->chip.irq_set_wake = mxs_gpio_set_wake_irq,
+ ct->chip.irq_set_wake = mxs_gpio_set_wake_irq;
ct->regs.ack = PINCTRL_IRQSTAT(port->id) + MXS_CLR;
ct->regs.mask = PINCTRL_IRQEN(port->id);
--
1.7.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v2] gpio/mxc/mxs: fix build error introduced by the irq_gc_ack() renaming
2011-07-19 13:16 ` [PATCH v2] gpio/mxc/mxs: fix build error introduced by the irq_gc_ack() renaming Shawn Guo
@ 2011-07-19 19:10 ` Grant Likely
0 siblings, 0 replies; 6+ messages in thread
From: Grant Likely @ 2011-07-19 19:10 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jul 19, 2011 at 09:16:56PM +0800, 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)
>
> The patch fixed a couple of typo of comma to semicolon.
>
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Applied, thanks.
g.
> ---
> Changes since v1:
> * Fix a couple of typo of comma to semicolon
>
> drivers/gpio/gpio-mxc.c | 4 ++--
> drivers/gpio/gpio-mxs.c | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c
> index 89fda58..4340aca 100644
> --- a/drivers/gpio/gpio-mxc.c
> +++ b/drivers/gpio/gpio-mxc.c
> @@ -297,11 +297,11 @@ 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;
> - ct->chip.irq_set_wake = gpio_set_wake_irq,
> + ct->chip.irq_set_wake = gpio_set_wake_irq;
> ct->regs.ack = GPIO_ISR;
> ct->regs.mask = GPIO_IMR;
>
> diff --git a/drivers/gpio/gpio-mxs.c b/drivers/gpio/gpio-mxs.c
> index d8cafba..af55a85 100644
> --- a/drivers/gpio/gpio-mxs.c
> +++ b/drivers/gpio/gpio-mxs.c
> @@ -156,11 +156,11 @@ 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;
> - ct->chip.irq_set_wake = mxs_gpio_set_wake_irq,
> + ct->chip.irq_set_wake = mxs_gpio_set_wake_irq;
> ct->regs.ack = PINCTRL_IRQSTAT(port->id) + MXS_CLR;
> ct->regs.mask = PINCTRL_IRQEN(port->id);
>
> --
> 1.7.4.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-07-19 19:10 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-19 3:34 [PATCH] gpio/mxc/mxs: fix build error introduced by the reanming of irq_gc_ack() Shawn Guo
2011-07-19 12:38 ` Sergei Shtylyov
2011-07-19 12:59 ` Shawn Guo
2011-07-19 15:23 ` Uwe Kleine-König
2011-07-19 13:16 ` [PATCH v2] gpio/mxc/mxs: fix build error introduced by the irq_gc_ack() renaming Shawn Guo
2011-07-19 19:10 ` Grant Likely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).