Message ID | abf74f93ec58e3b321dce23af3fa5af1ffa2e070.1443793711.git.nicolas.ferre@atmel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Hi all, Well it seems my cover letter is missing. So, here it is: ---8<---- pinctrl: at91-pio4: fixes for current linux-next (irq) While testing the sama5d2 on today's linux-next I discovered that some adaptations were missing. So, I don't know if you were aware but here are my fixes in case you don't have them already. +Cc: Thomas and Stephen in case these errors happen while building linux-next... Bye,
Le 02/10/2015 15:57, Nicolas Ferre a écrit : > Hi all, > > Well it seems my cover letter is missing. So, here it is: > > ---8<---- > pinctrl: at91-pio4: fixes for current linux-next (irq) > > While testing the sama5d2 on today's linux-next I discovered that some > adaptations were missing. So, I don't know if you were aware but here > are my fixes in case you don't have them already. > > +Cc: Thomas and Stephen in case these errors happen while building > linux-next... After seeing that Linus applied 2 patches by Ludovic, I realized that as I had foreseen correctly: it was known and corrected. Sorry for the noise. Bye,
Hi Nicolas, On Fri, Oct 02, 2015 at 03:57:32PM +0200, Nicolas Ferre wrote: > Hi all, > > Well it seems my cover letter is missing. So, here it is: > > ---8<---- > pinctrl: at91-pio4: fixes for current linux-next (irq) > > While testing the sama5d2 on today's linux-next I discovered that some > adaptations were missing. So, I don't know if you were aware but here > are my fixes in case you don't have them already. > > +Cc: Thomas and Stephen in case these errors happen while building > linux-next... Yes it happens, fixes sent and taken by Linus. > > Bye, Ludovic
diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c index 5e2189f17fe1..1f1a64ef3559 100644 --- a/drivers/pinctrl/pinctrl-at91-pio4.c +++ b/drivers/pinctrl/pinctrl-at91-pio4.c @@ -170,23 +170,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:
Use irq_set_handler_locked() as it avoids a redundant lookup of the irq descriptor. This adaptation landed on the pinctrl-at91.c driver while this one was being developped: synchronize with this enhancement and avoid the following compilation error: ../drivers/pinctrl/pinctrl-at91-pio4.c: In function 'atmel_gpio_irq_set_type': ../drivers/pinctrl/pinctrl-at91-pio4.c:173:3: error: implicit declaration of function '__irq_set_handler_locked' [-Werror=implicit-function-declaration] __irq_set_handler_locked(d->irq, handle_edge_irq); ^ Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> --- drivers/pinctrl/pinctrl-at91-pio4.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)