From patchwork Fri Oct 13 15:49:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 825544 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="MZf3D7mJ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yDC1L5DFyz9sRm for ; Sat, 14 Oct 2017 02:53:26 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758556AbdJMPtZ (ORCPT ); Fri, 13 Oct 2017 11:49:25 -0400 Received: from mail-qk0-f194.google.com ([209.85.220.194]:54090 "EHLO mail-qk0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757998AbdJMPtX (ORCPT ); Fri, 13 Oct 2017 11:49:23 -0400 Received: by mail-qk0-f194.google.com with SMTP id y23so5517929qkb.10; Fri, 13 Oct 2017 08:49:22 -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=9akHaouhut2WmyObF3o0dfpsq2u6F3yjV26R8OjKwjE=; b=MZf3D7mJhfr+zTKSkR1NetEC18FeS30mYLzyH1034I5GJusKvEDpar1HXv2z7EwJ31 2MYS7QzRs2BpsMkhc+Dr0B1ACVR15Ljl3oyOddmYRcW5QgQOGj/9KLmXd6/DqfrsIAdG gYZPjuy07tsgtGbahFCsWINaoypWDOzfJxaZCcmP3lpZXu4LoH3AYpp8o/4SB5pyv+Xm l5zb14bNUzIouZkYUwJzCnx3xc5BRGMigdi9k+HxpLZVQi5IvjrRawxRE8Bxp93vdZDW Prv78LowNkfMLnl8y9mgbZFgScLhNOThOUQ7qCgfZQjw6LqmHeRRAzN7xeEXyzh13NLK UuMw== 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=9akHaouhut2WmyObF3o0dfpsq2u6F3yjV26R8OjKwjE=; b=UZcGoQ4CJfHr8RGNAAW5He9fsbK9UjGruvf2GXKtpJVDxcnixE+MX85XrX9MI3BXN8 NAqNYe2DOnGTmO/Gy+rrjv4kiJFKnizxL9/TBEDBXOsYcyb2UfR0vmIN7p8P1q72eudQ mFoBkTgIlSBirQCzXSJExPmvDlzI3MSmraVEXPjvEAPvL+Ni5SktfTcTM2BNlfTqyIm/ cW0lJU0S0QEya87MTw6vI5u8RZZqd3x3F9RKjr4ZG1c97q2ZQewEMdHvMVAi2EbNvilg Zqz5WoqFJ9rkSHjsYmDICAh6vDtzhUqHN8TlSMrQCqqNSWNYSDCpkqu0Kc1UhSebK5Hi 45Ig== X-Gm-Message-State: AMCzsaUq4EfIxbWoMfMxCybsKk/z2xfEHPu4S6p35YQYLJBIkeyc+42p FyhYBeyOPjb7A7ULM6u3gIE= X-Google-Smtp-Source: ABhQp+TSGFkboZUd0uCJBG6IE2SzIBbAEAb1yZCq74+Bz0cVSsys6Pf/sMh9v2syHaGc+AvODqLWGA== X-Received: by 10.233.244.11 with SMTP id y11mr2430627qkl.164.1507909762349; Fri, 13 Oct 2017 08:49:22 -0700 (PDT) Received: from localhost (p200300E41BE4FD00CEAD5B94E1CFD280.dip0.t-ipconnect.de. [2003:e4:1be4:fd00:cead:5b94:e1cf:d280]) by smtp.gmail.com with ESMTPSA id h1sm713771qkf.10.2017.10.13.08.49.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 13 Oct 2017 08:49:21 -0700 (PDT) From: Thierry Reding To: Linus Walleij Cc: Jonathan Hunter , Grygorii Strashko , linux-gpio@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 02/13] gpio: Move irqchip into struct gpio_irq_chip Date: Fri, 13 Oct 2017 17:49:02 +0200 Message-Id: <20171013154913.29448-3-thierry.reding@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171013154913.29448-1-thierry.reding@gmail.com> References: <20171013154913.29448-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 | 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 a90266dda9ef..4a625128e215 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1640,7 +1640,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); @@ -1733,10 +1733,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); @@ -1811,7 +1811,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; @@ -1820,7 +1820,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 8a6407540514..830bc6aaf970 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 /** @@ -110,7 +122,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_base: first linux IRQ number assigned to GPIO IRQ chip (deprecated) @@ -193,7 +204,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; unsigned int irq_base; irq_flow_handler_t irq_handler;