From patchwork Fri Sep 1 18:57:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 808973 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="eOO/vAW/"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xkTBV21G3z9sPt for ; Sat, 2 Sep 2017 05:02:10 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752441AbdIAS5u (ORCPT ); Fri, 1 Sep 2017 14:57:50 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:37046 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752438AbdIAS5s (ORCPT ); Fri, 1 Sep 2017 14:57:48 -0400 Received: by mail-wm0-f65.google.com with SMTP id x189so953454wmg.4; Fri, 01 Sep 2017 11:57:47 -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=Wac7PTBZaHThj8QOdMgOZ9R3+5mVhE5YItgB28I81Os=; b=eOO/vAW/OXBrSXb7NrkgvRsMlR/HHloY1LIR9tWZ/I+E2nqEHGFeJIc+3ujt6ehoFp YFApJHYDNrbICENAO2T8FJ0JiekPBblfZPAAGV7MJOqXFCrGsirRxhYvDgjXa5aL0CAQ 7capVjhvpINJYFC8VnUG2GL+9e7MAu5K6kGDxw7GFk/O1ZBMwyNNz7nvxSk59RvLc9ex ml2vMzr0M0+B2XA1+P8hK77Ypbb7MPAW/+OYMale0O2KT6pHMSnMmzzLilIiIXug8EK/ m95sHpLuKLDcXLgEuZ1KSk4f8gAEBR58mIKaEfVwu9Q30946kZJfSIencNOgkS71Vz0c ldJw== 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=Wac7PTBZaHThj8QOdMgOZ9R3+5mVhE5YItgB28I81Os=; b=PC/Xjp46x/+o+he+/axKKwzuSxzPqmAYR2sQOmEADSSbRL7yScEzajRcucelnCTReF jgBit4N/23ESxCzRO90k9yhG8JL889g1y8Ii1E2+oruTBtBG5tfMQP0DxvClYeVzh/JU Ce5RwGd6khHnUekYgHY5gTMWChjoylV6YbWA13g+nb1v/sFxrBZOvY0sZyRkKcgNnjfp 0rgpTTLbN3pNIP4vbjT/IrAB11tAyhmCJdT7nT6dr+knwboAM8XgeqgdSzQpRByheAUl KxcodwqZy/rqvuw4FbI3Ee1lzw8M2aXsRvR7MdRfbwKQ2ajKyWM1jvPWrzqNkEbaPCc5 tBig== X-Gm-Message-State: AHPjjUgJS/vctBLj8qpSSWd/rgV5OkrR27a+BE6xoFdJu2XKSxCk7hJd RXV2FEu0cLNUqj/U X-Google-Smtp-Source: ADKCNb40zSDUur95XlowR97Bs3dbkPejP79u+UnwKKYi1ly3sMK8e3qigPWjpnfaGaosdRofeWn9rw== X-Received: by 10.28.210.8 with SMTP id j8mr977528wmg.164.1504292267009; Fri, 01 Sep 2017 11:57:47 -0700 (PDT) Received: from localhost (p200300E41BD6D60076D02BFFFE273F51.dip0.t-ipconnect.de. [2003:e4:1bd6:d600:76d0:2bff:fe27:3f51]) by smtp.gmail.com with ESMTPSA id t135sm498827wmt.30.2017.09.01.11.57.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Sep 2017 11:57: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 05/16] gpio: Move irq_handler to struct gpio_irq_chip Date: Fri, 1 Sep 2017 20:57:25 +0200 Message-Id: <20170901185736.28051-6-thierry.reding@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170901185736.28051-1-thierry.reding@gmail.com> References: <20170901185736.28051-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 e5ad28978d5c..75fa734cfa98 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1656,7 +1656,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); @@ -1960,7 +1960,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 @@ -55,6 +55,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: * * The interrupt handler for the GPIO chip's parent interrupts, may be @@ -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;