linux-kernel - [PATCH 2/2] pinctrl: at91-pio4: Adapt to new irq flow handler prototype

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 2 Oct 2015 15:50:46 +0200
From:	Nicolas Ferre <nicolas.ferre@...el.com>
To:	Ludovic Desroches <ludovic.desroches@...el.com>,
	<linus.walleij@...aro.org>, <linux-arm-kernel@...ts.infradead.org>
CC:	<linux-kernel@...r.kernel.org>, <linux-gpio@...r.kernel.org>,
	<s.hauer@...gutronix.de>, <alexandre.belloni@...e-electrons.com>,
	Nicolas Ferre <nicolas.ferre@...el.com>
Subject: [PATCH 2/2] pinctrl: at91-pio4: Adapt to new irq flow handler prototype

Adapt atmel_gpio_irq_handler() function as the "irq" argument is now removed
from the irq flow handlers prototype in commit
bd0b9ac405e1794d72533c3d487aa65b6b955a0c (genirq: Remove irq argument from irq
flow handlers).

This allows to remove this warning:
../drivers/pinctrl/pinctrl-at91-pio4.c: In function 'atmel_pinctrl_probe':
../drivers/pinctrl/pinctrl-at91-pio4.c:1000:3: warning: passing argument 2 of
'irq_set_chained_handler' from incompatible pointer type [enabled by default]
   irq_set_chained_handler(res->start, atmel_gpio_irq_handler);
   ^
In file included from ../include/linux/gpio/driver.h:6:0,
                 from ../include/asm-generic/gpio.h:12,
                 from ../arch/arm/include/asm/gpio.h:9,
                 from ../include/linux/gpio.h:48,
                 from ../drivers/pinctrl/pinctrl-at91-pio4.c:18:
../include/linux/irq.h:548:1: note: expected 'irq_flow_handler_t' but argument
is of type 'void (*)(unsigned int,  struct irq_desc *)'
 irq_set_chained_handler(unsigned int irq, irq_flow_handler_t handle)

This change appeared while the driver was being reviewed and was being included
in pinctrl tree.

Signed-off-by: Nicolas Ferre <nicolas.ferre@...el.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 1f1a64ef3559..cae0748aca25 100644
--- a/drivers/pinctrl/pinctrl-at91-pio4.c
+++ b/drivers/pinctrl/pinctrl-at91-pio4.c
@@ -248,10 +248,11 @@ static struct irq_chip atmel_gpio_irq_chip = {
 	.irq_set_wake	= atmel_gpio_irq_set_wake,
 };
 
-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);
+	struct atmel_pioctrl *atmel_pioctrl = irq_desc_get_handler_data(desc);
 	struct irq_chip *chip = irq_desc_get_chip(desc);
+	unsigned int irq = irq_desc_get_irq(desc);
 	unsigned long isr;
 	int n, bank = -1;
 
-- 
2.1.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/