From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751046AbdJRQdB (ORCPT ); Wed, 18 Oct 2017 12:33:01 -0400 Received: from botnar.kaiser.cx ([176.28.20.183]:47098 "EHLO botnar.kaiser.cx" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750724AbdJRQc7 (ORCPT ); Wed, 18 Oct 2017 12:32:59 -0400 From: Martin Kaiser To: Linus Walleij Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH] gpiolib: clear irq handler and data in one go Date: Wed, 18 Oct 2017 18:32:47 +0200 Message-Id: <1508344367-572-1-git-send-email-martin@kaiser.cx> X-Mailer: git-send-email 2.1.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Replace the two separate calls for clearing the irqchip's chained handler and its data with a single irq_set_chained_handler_and_data() call. Signed-off-by: Martin Kaiser --- drivers/gpio/gpiolib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index eb80dac..809654a 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1718,8 +1718,8 @@ static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip) acpi_gpiochip_free_interrupts(gpiochip); if (gpiochip->irq_chained_parent) { - irq_set_chained_handler(gpiochip->irq_chained_parent, NULL); - irq_set_handler_data(gpiochip->irq_chained_parent, NULL); + irq_set_chained_handler_and_data( + gpiochip->irq_chained_parent, NULL, NULL); } /* Remove all IRQ mappings and delete the domain */ -- 2.1.4