From patchwork Fri Oct 2 13:50:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Ferre X-Patchwork-Id: 7316511 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BA29BBEEA4 for ; Fri, 2 Oct 2015 13:53:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D5FEF20835 for ; Fri, 2 Oct 2015 13:53:21 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 71EE5208E7 for ; Fri, 2 Oct 2015 13:53:20 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Zi0jw-0004TO-Mq; Fri, 02 Oct 2015 13:51:12 +0000 Received: from eusmtp01.atmel.com ([212.144.249.242]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Zi0ju-0004OR-Ae for linux-arm-kernel@lists.infradead.org; Fri, 02 Oct 2015 13:51:11 +0000 Received: from tenerife.corp.atmel.com (10.161.101.13) by eusmtp01.atmel.com (10.161.101.30) with Microsoft SMTP Server id 14.3.235.1; Fri, 2 Oct 2015 15:50:42 +0200 From: Nicolas Ferre To: Ludovic Desroches , , Subject: [PATCH 2/2] pinctrl: at91-pio4: Adapt to new irq flow handler prototype Date: Fri, 2 Oct 2015 15:50:46 +0200 Message-ID: <37a4986f2752faa3d82f56d1235c619d09dec97f.1443793711.git.nicolas.ferre@atmel.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151002_065110_751395_A8EA03FF X-CRM114-Status: UNSURE ( 9.46 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -4.2 (----) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-gpio@vger.kernel.org, s.hauer@pengutronix.de, alexandre.belloni@free-electrons.com, linux-kernel@vger.kernel.org, Nicolas Ferre Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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;