From patchwork Thu Nov 2 17:49:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 833466 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="TTxGx/AY"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ySXlv58ptz9sMN for ; Fri, 3 Nov 2017 04:54:35 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933553AbdKBRyS (ORCPT ); Thu, 2 Nov 2017 13:54:18 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:49768 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933314AbdKBRts (ORCPT ); Thu, 2 Nov 2017 13:49:48 -0400 Received: by mail-wr0-f194.google.com with SMTP id g90so327501wrd.6; Thu, 02 Nov 2017 10:49: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=DICG3mvEgvelc9CyJLwrKAMwFgBcXiS7TkzKczfip5s=; b=TTxGx/AYALswe70iOSQX6bixTpmRq5PcC82Eyk4S17mHvynj4AARu734vdj7/4v0I+ 7xd5x13ubXwM6Kxya4CNk3dWldNA5ZAAonPi4XcCa7gjjjNyHyfc87ttbh8rAw6MDoyK zNZUQK9qstdnPUtztk0oBt3eXeJLXfH688CcXx+cs3mKJAL/I0HVg9LfucSQvbJyx3qM QF3dYiDMP1hXD0zGWeZUM9GA1z5bCYXCnFeAeIUNRc8Y++N+GhsuoIg+AfOjviCWrrhO hB2lMGNzMBEF5yMr0wvM/jdo63xbcC3hvcs+lRzaKnf3mXhd2x2UJYqdzO4uQaySllYK JHww== 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=DICG3mvEgvelc9CyJLwrKAMwFgBcXiS7TkzKczfip5s=; b=L/GelRyasIx9RgrY3lL84r91vBnpV8BR637cbeZkb9zfnsi0Y3MbQll/BM8Oti+vFI bNumVtmooCMCJtyf5Im3pnMcdI5DXAZD5Y1jog0ZeOy9WC9caON5n1wlsbxlZPqJdV+M zT9D1R0n+dwZkAcPvXeqJliXauPGCLEwl9JHvIGnsv35T6SxlLDvvbgjnK4fFV3HxdK+ f7HuH0g4IHzlFvETOxFP0T36SUf2LdysAX0Djai1goXyQWVoW18iMW7Qtf3yT/7EprVl 7j7U/NJ98rZFo2BeKCfgsiuzepp/e66YhQ5fIbje617SPIDUEBqTxohbMTzPw0bR4gRB +aTA== X-Gm-Message-State: AMCzsaWcHBiG1K4d1J1gA9xUgb9JCYP44ix2RfLz2Us/+kkM0d9uMa34 l26vttWFxURW8IsNsIkHmUQ= X-Google-Smtp-Source: ABhQp+SRbyDGwthcbimshtTSQJBOYDWhK59IegqI/chq/4bOLyu68II136saWuX6FU4F5I+ziSva8g== X-Received: by 10.223.142.180 with SMTP id q49mr3962054wrb.142.1509644986277; Thu, 02 Nov 2017 10:49:46 -0700 (PDT) Received: from localhost (p200300E41BC8E9001FF851737372D2C2.dip0.t-ipconnect.de. [2003:e4:1bc8:e900:1ff8:5173:7372:d2c2]) by smtp.gmail.com with ESMTPSA id u18sm4701025wrg.94.2017.11.02.10.49.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 Nov 2017 10:49:45 -0700 (PDT) From: Thierry Reding To: Linus Walleij Cc: Grygorii Strashko , Jonathan Hunter , linux-gpio@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 02/12] gpio: Move irqchip into struct gpio_irq_chip Date: Thu, 2 Nov 2017 18:49:31 +0100 Message-Id: <20171102174941.3461-3-thierry.reding@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171102174941.3461-1-thierry.reding@gmail.com> References: <20171102174941.3461-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 | 14 +++++++------- include/linux/gpio/driver.h | 14 ++++++++++++-- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 3827f0767101..d3d0b3134ba3 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->irqchip, 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); @@ -1739,10 +1739,10 @@ static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip) irq_domain_remove(gpiochip->irqdomain); } - if (gpiochip->irqchip) { - gpiochip->irqchip->irq_request_resources = NULL; - gpiochip->irqchip->irq_release_resources = NULL; - gpiochip->irqchip = NULL; + if (gpiochip->irq.chip) { + gpiochip->irq.chip->irq_request_resources = NULL; + gpiochip->irq.chip->irq_release_resources = NULL; + gpiochip->irq.chip = NULL; } gpiochip_irqchip_free_valid_mask(gpiochip); @@ -1817,7 +1817,7 @@ int gpiochip_irqchip_add_key(struct gpio_chip *gpiochip, type = IRQ_TYPE_NONE; } - gpiochip->irqchip = irqchip; + gpiochip->irq.chip = irqchip; gpiochip->irq_handler = handler; gpiochip->irq_default_type = type; gpiochip->to_irq = gpiochip_to_irq; @@ -1826,7 +1826,7 @@ int gpiochip_irqchip_add_key(struct gpio_chip *gpiochip, gpiochip->ngpio, first_irq, &gpiochip_domain_ops, gpiochip); if (!gpiochip->irqdomain) { - gpiochip->irqchip = NULL; + gpiochip->irq.chip = NULL; return -EINVAL; } diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h index 36a065521fa0..a79b3b18fadd 100644 --- a/include/linux/gpio/driver.h +++ b/include/linux/gpio/driver.h @@ -24,6 +24,13 @@ struct module; * struct gpio_irq_chip - GPIO interrupt controller */ struct gpio_irq_chip { + /** + * @chip: + * + * GPIO IRQ chip implementation, provided by GPIO driver. + */ + struct irq_chip *chip; + /** * @domain_ops: * @@ -47,6 +54,11 @@ struct gpio_irq_chip { */ void *parent_handler_data; }; + +static inline struct gpio_irq_chip *to_gpio_irq_chip(struct irq_chip *chip) +{ + return container_of(chip, struct gpio_irq_chip, chip); +} #endif /** @@ -112,7 +124,6 @@ struct gpio_irq_chip { * safely. * @bgpio_dir: shadowed direction register for generic GPIO to clear/set * direction safely. - * @irqchip: GPIO IRQ chip impl, provided by GPIO driver * @irqdomain: Interrupt translation domain; responsible for mapping * between GPIO hwirq number and linux irq number * @irq_handler: the irq handler to use (often a predefined irq core function) @@ -197,7 +208,6 @@ struct gpio_chip { * With CONFIG_GPIOLIB_IRQCHIP we get an irqchip inside the gpiolib * to handle IRQs for most practical cases. */ - struct irq_chip *irqchip; struct irq_domain *irqdomain; irq_flow_handler_t irq_handler; unsigned int irq_default_type;