From patchwork Thu Sep 28 09:56:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 819510 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-tegra-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="LaSvYeVJ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y2qsl6c8Mz9t5Y for ; Thu, 28 Sep 2017 19:59:23 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752830AbdI1J4v (ORCPT ); Thu, 28 Sep 2017 05:56:51 -0400 Received: from mail-qk0-f194.google.com ([209.85.220.194]:33575 "EHLO mail-qk0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752735AbdI1J4q (ORCPT ); Thu, 28 Sep 2017 05:56:46 -0400 Received: by mail-qk0-f194.google.com with SMTP id g128so654237qke.0; Thu, 28 Sep 2017 02:56:46 -0700 (PDT) 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=45LtERjw0e+xQZy2Ig2GRChLGgq8jbWAinjmBEWrsl4=; b=LaSvYeVJO3dyupFBiJYwIekdQiiN9OFQ5UBrTBS16XkYaSd9u7d8+eFLAijSWYk2Tb BCSMubEGmdixZYRsjcl6SR9aS1alunpUpdfB1AIQYrRqu5lo8xTPOd1Oci62sr+iyEIk 2SlJwwUP8wsAuPrb085RVpH0qf96vxUWMtUtzTOe7b0nJkMdAuogq/LRZnhc1c9vsIwV yGUp9Q1Xi41euR93I7u2ARp2OSE+bmsib9nWh9SEytqYC2XOm+cRwhao3llky6mR8zVi I5E9Dr7D7J4o//W1V/lPuUVi45jJ/E7P8Lq8NHllk7f3lPlp5tPoG5X1GipgKZYv2lsd 05bA== 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=45LtERjw0e+xQZy2Ig2GRChLGgq8jbWAinjmBEWrsl4=; b=kR4UJe+kAQDQDJU7VAeWjy9PH5gQnea0C/eoaCHm43LyPUFZEp7ZnH30FdL3Ol4pwy 1aSUNzmLROHBwInLfs1NA0n/B5Ne6gPI6/ty2fD0fM2t5PprQQismWvXo6VMUlTF93HA 4e3a+1sbg/HJQgCYmtu1IfbXtVVmnMdxUNNcLuU2w24nFyK+Jd0UCC2p5jdF9eLg35Iy Jkv9j6Br6OB5VGLkhsJ67rqmDJHvxzAOT6s2FWN2EQkM1KpDbfHJPH+4MYI4czl/6w2q NAiQYCTx17k2qZlMaqQSNVNFY1Kb2XXf72lFYnSPgwHTkOEsXDQ0vpRbvnMVfwUyYhYz ip0g== X-Gm-Message-State: AHPjjUjvMgyv3Ho95Z3ny1V6vPY3ktGhKfLRTxiGAnBjYb/bhKNmIZEw jyF+ZGtwMkhMZEDZPdYf5vc= X-Google-Smtp-Source: AOwi7QAux9JlgUCS4uVtjttf5ieNfcwJOCbl2Jubj/+6VoBYkEGRcbCWpCFAnBj9tzdZTN9H55sszg== X-Received: by 10.55.150.195 with SMTP id y186mr5894260qkd.36.1506592605819; Thu, 28 Sep 2017 02:56:45 -0700 (PDT) Received: from localhost (p200300E41BCC8100EA54DC343767CF80.dip0.t-ipconnect.de. [2003:e4:1bcc:8100:ea54:dc34:3767:cf80]) by smtp.gmail.com with ESMTPSA id d186sm726896qkg.46.2017.09.28.02.56.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Sep 2017 02:56:45 -0700 (PDT) From: Thierry Reding To: Linus Walleij Cc: Jonathan Hunter , linux-gpio@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 05/16] gpio: Move irq_handler to struct gpio_irq_chip Date: Thu, 28 Sep 2017 11:56:17 +0200 Message-Id: <20170928095628.21966-6-thierry.reding@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170928095628.21966-1-thierry.reding@gmail.com> References: <20170928095628.21966-1-thierry.reding@gmail.com> Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@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 2f0fa3d646d2..dc44f2c97498 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1645,7 +1645,7 @@ 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); @@ -1949,7 +1949,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 9389406df0b1..b1398ea0c32a 100644 --- a/include/linux/gpio/driver.h +++ b/include/linux/gpio/driver.h @@ -54,6 +54,14 @@ struct gpio_irq_chip { */ unsigned int first; + /** + * @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: * @@ -160,8 +168,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, @@ -239,7 +245,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;