* [PATCH 0/2] Fixes for next
@ 2015-09-28 9:41 Ludovic Desroches
2015-09-28 9:41 ` [PATCH 1/2] pinctrl: at91-pio4: use irq_set_handler_locked Ludovic Desroches
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Ludovic Desroches @ 2015-09-28 9:41 UTC (permalink / raw)
To: linus.walleij, sfr
Cc: linux-next, linux-kernel, nicolas.ferre, Ludovic Desroches
Hi Stephen, Linus,
Here are fixes for next. I did the at91-pio4 patches on top of next-20150916
which doesn't contain some tglx's updates about irqs.
Ludovic Desroches (2):
pinctrl: at91-pio4: use irq_set_handler_locked
pinctrl: at91-pio4: irq argument as been removed from irq flow
handlers
drivers/pinctrl/pinctrl-at91-pio4.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
--
2.5.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] pinctrl: at91-pio4: use irq_set_handler_locked
2015-09-28 9:41 [PATCH 0/2] Fixes for next Ludovic Desroches
@ 2015-09-28 9:41 ` Ludovic Desroches
2015-10-02 21:51 ` Linus Walleij
2015-09-28 9:41 ` [PATCH 2/2] pinctrl: at91-pio4: irq argument as been removed from irq flow handlers Ludovic Desroches
2015-09-28 9:43 ` [PATCH 0/2] Fixes for next Ludovic Desroches
2 siblings, 1 reply; 6+ messages in thread
From: Ludovic Desroches @ 2015-09-28 9:41 UTC (permalink / raw)
To: linus.walleij, sfr
Cc: linux-next, linux-kernel, nicolas.ferre, Ludovic Desroches
Use irq_set_handler_locked() as it avoids a redundant lookup of the
irq descriptor.
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
---
drivers/pinctrl/pinctrl-at91-pio4.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c
index 6aff632..041df59 100644
--- a/drivers/pinctrl/pinctrl-at91-pio4.c
+++ b/drivers/pinctrl/pinctrl-at91-pio4.c
@@ -167,23 +167,23 @@ static int atmel_gpio_irq_set_type(struct irq_data *d, unsigned type)
switch (type) {
case IRQ_TYPE_EDGE_RISING:
- __irq_set_handler_locked(d->irq, handle_edge_irq);
+ irq_set_handler_locked(d, handle_edge_irq);
reg |= ATMEL_PIO_CFGR_EVTSEL_RISING;
break;
case IRQ_TYPE_EDGE_FALLING:
- __irq_set_handler_locked(d->irq, handle_edge_irq);
+ irq_set_handler_locked(d, handle_edge_irq);
reg |= ATMEL_PIO_CFGR_EVTSEL_FALLING;
break;
case IRQ_TYPE_EDGE_BOTH:
- __irq_set_handler_locked(d->irq, handle_edge_irq);
+ irq_set_handler_locked(d, handle_edge_irq);
reg |= ATMEL_PIO_CFGR_EVTSEL_BOTH;
break;
case IRQ_TYPE_LEVEL_LOW:
- __irq_set_handler_locked(d->irq, handle_level_irq);
+ irq_set_handler_locked(d, handle_level_irq);
reg |= ATMEL_PIO_CFGR_EVTSEL_LOW;
break;
case IRQ_TYPE_LEVEL_HIGH:
- __irq_set_handler_locked(d->irq, handle_level_irq);
+ irq_set_handler_locked(d, handle_level_irq);
reg |= ATMEL_PIO_CFGR_EVTSEL_HIGH;
break;
case IRQ_TYPE_NONE:
--
2.5.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] pinctrl: at91-pio4: irq argument as been removed from irq flow handlers
2015-09-28 9:41 [PATCH 0/2] Fixes for next Ludovic Desroches
2015-09-28 9:41 ` [PATCH 1/2] pinctrl: at91-pio4: use irq_set_handler_locked Ludovic Desroches
@ 2015-09-28 9:41 ` Ludovic Desroches
2015-10-02 21:53 ` Linus Walleij
2015-09-28 9:43 ` [PATCH 0/2] Fixes for next Ludovic Desroches
2 siblings, 1 reply; 6+ messages in thread
From: Ludovic Desroches @ 2015-09-28 9:41 UTC (permalink / raw)
To: linus.walleij, sfr
Cc: linux-next, linux-kernel, nicolas.ferre, Ludovic Desroches
Irq argument as been removed from irq flow handlers so use the irq
descriptor to retrieve data we need.
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
---
drivers/pinctrl/pinctrl-at91-pio4.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c
index 041df59..4aa6be0 100644
--- a/drivers/pinctrl/pinctrl-at91-pio4.c
+++ b/drivers/pinctrl/pinctrl-at91-pio4.c
@@ -222,9 +222,10 @@ static struct irq_chip atmel_gpio_irq_chip = {
.irq_set_type = atmel_gpio_irq_set_type,
};
-static void atmel_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void atmel_gpio_irq_handler(struct irq_desc *desc)
{
- struct atmel_pioctrl *atmel_pioctrl = irq_get_handler_data(irq);
+ unsigned int irq = irq_desc_get_irq(desc);
+ struct atmel_pioctrl *atmel_pioctrl = irq_desc_get_handler_data(desc);
struct irq_chip *chip = irq_desc_get_chip(desc);
unsigned long isr;
int n, bank = -1;
--
2.5.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 0/2] Fixes for next
2015-09-28 9:41 [PATCH 0/2] Fixes for next Ludovic Desroches
2015-09-28 9:41 ` [PATCH 1/2] pinctrl: at91-pio4: use irq_set_handler_locked Ludovic Desroches
2015-09-28 9:41 ` [PATCH 2/2] pinctrl: at91-pio4: irq argument as been removed from irq flow handlers Ludovic Desroches
@ 2015-09-28 9:43 ` Ludovic Desroches
2 siblings, 0 replies; 6+ messages in thread
From: Ludovic Desroches @ 2015-09-28 9:43 UTC (permalink / raw)
To: linus.walleij, sfr
Cc: linux-next, linux-kernel, nicolas.ferre, Ludovic Desroches
Sorry I have forgotten:
--in-reply-to=20150925133410.3c9e2b03@canb.auug.org.au
(linux-next: build failure after merge of the pinctrl tree)
On Mon, Sep 28, 2015 at 11:41:11AM +0200, Ludovic Desroches wrote:
> Hi Stephen, Linus,
>
> Here are fixes for next. I did the at91-pio4 patches on top of next-20150916
> which doesn't contain some tglx's updates about irqs.
>
> Ludovic Desroches (2):
> pinctrl: at91-pio4: use irq_set_handler_locked
> pinctrl: at91-pio4: irq argument as been removed from irq flow
> handlers
>
> drivers/pinctrl/pinctrl-at91-pio4.c | 15 ++++++++-------
> 1 file changed, 8 insertions(+), 7 deletions(-)
>
> --
> 2.5.0
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] pinctrl: at91-pio4: use irq_set_handler_locked
2015-09-28 9:41 ` [PATCH 1/2] pinctrl: at91-pio4: use irq_set_handler_locked Ludovic Desroches
@ 2015-10-02 21:51 ` Linus Walleij
0 siblings, 0 replies; 6+ messages in thread
From: Linus Walleij @ 2015-10-02 21:51 UTC (permalink / raw)
To: Ludovic Desroches
Cc: Stephen Rothwell, linux-next, linux-kernel, Nicolas Ferre
On Mon, Sep 28, 2015 at 2:41 AM, Ludovic Desroches
<ludovic.desroches@atmel.com> wrote:
> Use irq_set_handler_locked() as it avoids a redundant lookup of the
> irq descriptor.
>
> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Patch applied.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] pinctrl: at91-pio4: irq argument as been removed from irq flow handlers
2015-09-28 9:41 ` [PATCH 2/2] pinctrl: at91-pio4: irq argument as been removed from irq flow handlers Ludovic Desroches
@ 2015-10-02 21:53 ` Linus Walleij
0 siblings, 0 replies; 6+ messages in thread
From: Linus Walleij @ 2015-10-02 21:53 UTC (permalink / raw)
To: Ludovic Desroches
Cc: Stephen Rothwell, linux-next, linux-kernel, Nicolas Ferre
On Mon, Sep 28, 2015 at 2:41 AM, Ludovic Desroches
<ludovic.desroches@atmel.com> wrote:
> Irq argument as been removed from irq flow handlers so use the irq
> descriptor to retrieve data we need.
>
> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Patch applied.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-10-02 21:53 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-09-28 9:41 [PATCH 0/2] Fixes for next Ludovic Desroches
2015-09-28 9:41 ` [PATCH 1/2] pinctrl: at91-pio4: use irq_set_handler_locked Ludovic Desroches
2015-10-02 21:51 ` Linus Walleij
2015-09-28 9:41 ` [PATCH 2/2] pinctrl: at91-pio4: irq argument as been removed from irq flow handlers Ludovic Desroches
2015-10-02 21:53 ` Linus Walleij
2015-09-28 9:43 ` [PATCH 0/2] Fixes for next Ludovic Desroches
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).