From patchwork Tue Nov 7 18:15:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 835412 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XMF5wImo"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yWd3W1GK6z9t2S for ; Wed, 8 Nov 2017 05:18:47 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756112AbdKGSQQ (ORCPT ); Tue, 7 Nov 2017 13:16:16 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:55515 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755709AbdKGSQI (ORCPT ); Tue, 7 Nov 2017 13:16:08 -0500 Received: by mail-wm0-f68.google.com with SMTP id y83so5787930wmc.4; Tue, 07 Nov 2017 10:16:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dAN9udGgwmKhKC/ZfWhXgoktX9lgGxPQt4ElmfITU4U=; b=XMF5wImohiDOej/AxsScFcWMbAlCmsJ33jiUfmTIfNjaSuieYNljrGtOXuqJ78RfyU 2TPracTuifsj//E0L/M9q0QiDA1H6bqnJnQJ8njyirV3XoD74L8ZwshJWjbm3xIeRBdq 0hU2MCLWH6EydbPDKBAs+f0TXJBQpIKpcrNLngff7TQRMRuJ8lWmqIXrzNedRzjF0/kv bmc+LD7xadtEIdim0bNAGuVZUoi3NkLNvMSX5WhKu5KoVjB0BlEapxNH6DAdWpZuZff4 MCi864XJpcIibklmveQLx1Sit2ejDXZORNR9JmSUsa/jCKhL/133Sloc+awlD6Wi6l1e sS1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dAN9udGgwmKhKC/ZfWhXgoktX9lgGxPQt4ElmfITU4U=; b=cZpVxlmK7RCY17LKbca5YBjjoMM4r3UK8UiEX5OjkTHHjCRS9T+9p/DYmEabLZQCmT yTkYRHs+Tq71FM+SyymiGnBPwErfMPpyUeM/84Zq3vNN70J+0GiLHJPOpC26HBBwoFal mmf95DQIu9pNOKqpVuqDPmvOHG3qwjsPYw4Z+stVchpLSD2AHNp3gOeoBCMVS9gOgxta d5NbWpL1QaWNe/TqShUkGpxEWWT7a2HRwrt4eU0rEtAYBisB5lpzroGBRe+/S8hfF7Lr Ej2ELltJO3DcSk3tQAiS/eWzHfrWMJytoILHdi7wuwYif64rg2cmBtdPmcovUGMMjwir U45w== X-Gm-Message-State: AJaThX6lVNijIxs8aKOWkzBiDs3JQouRo9A4gitAbX9VfEBZGcNc2gzt O0UkrUFbaU/m5OPMYm2qxaI= X-Google-Smtp-Source: ABhQp+Swmq4e+wMBAC4UN5r+92SDRZAjLvEv+9oDBzMUZYV6LD0fbqZkBR669BrtCKfAmbTy6sXYpQ== X-Received: by 10.28.22.204 with SMTP id 195mr45940wmw.11.1510078567282; Tue, 07 Nov 2017 10:16:07 -0800 (PST) Received: from localhost (p200300E41BC8E9001FF851737372D2C2.dip0.t-ipconnect.de. [2003:e4:1bc8:e900:1ff8:5173:7372:d2c2]) by smtp.gmail.com with ESMTPSA id b81sm1002273wmb.6.2017.11.07.10.16.06 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 07 Nov 2017 10:16:06 -0800 (PST) From: Thierry Reding To: Linus Walleij , Grygorii Strashko Cc: Jonathan Hunter , linux-gpio@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v7 04/15] gpio: Move irq_handler to struct gpio_irq_chip Date: Tue, 7 Nov 2017 19:15:48 +0100 Message-Id: <20171107181559.6318-5-thierry.reding@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171107181559.6318-1-thierry.reding@gmail.com> References: <20171107181559.6318-1-thierry.reding@gmail.com> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Thierry Reding In order to consolidate the multiple ways to associate an IRQ chip with a GPIO chip, move more fields into the new struct gpio_irq_chip. Signed-off-by: Thierry Reding --- drivers/gpio/gpiolib.c | 4 ++-- include/linux/gpio/driver.h | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index d54eaa602548..1add11d12ca0 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1646,7 +1646,7 @@ static int gpiochip_irq_map(struct irq_domain *d, unsigned int irq, * category than their parents, so it won't report false recursion. */ irq_set_lockdep_class(irq, chip->lock_key); - irq_set_chip_and_handler(irq, chip->irq.chip, chip->irq_handler); + irq_set_chip_and_handler(irq, chip->irq.chip, chip->irq.handler); /* Chips that use nested thread handlers have them marked */ if (chip->irq_nested) irq_set_nested_thread(irq, 1); @@ -1820,7 +1820,7 @@ int gpiochip_irqchip_add_key(struct gpio_chip *gpiochip, } gpiochip->irq.chip = irqchip; - gpiochip->irq_handler = handler; + gpiochip->irq.handler = handler; gpiochip->irq_default_type = type; gpiochip->to_irq = gpiochip_to_irq; gpiochip->lock_key = lock_key; diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h index 3a37b2c0dd9b..5b6ef78cb196 100644 --- a/include/linux/gpio/driver.h +++ b/include/linux/gpio/driver.h @@ -47,6 +47,14 @@ struct gpio_irq_chip { */ const struct irq_domain_ops *domain_ops; + /** + * @handler: + * + * The IRQ handler to use (often a predefined IRQ core function) for + * GPIO IRQs, provided by GPIO driver. + */ + irq_flow_handler_t handler; + /** * @parent_handler: * @@ -133,8 +141,6 @@ static inline struct gpio_irq_chip *to_gpio_irq_chip(struct irq_chip *chip) * safely. * @bgpio_dir: shadowed direction register for generic GPIO to clear/set * direction safely. - * @irq_handler: the irq handler to use (often a predefined irq core function) - * for GPIO IRQs, provided by GPIO driver * @irq_default_type: default IRQ triggering type applied during GPIO driver * initialization, provided by GPIO driver * @irq_chained_parent: GPIO IRQ chip parent/bank linux irq number, @@ -215,7 +221,6 @@ struct gpio_chip { * With CONFIG_GPIOLIB_IRQCHIP we get an irqchip inside the gpiolib * to handle IRQs for most practical cases. */ - irq_flow_handler_t irq_handler; unsigned int irq_default_type; unsigned int irq_chained_parent; bool irq_nested;