From patchwork Thu Nov 2 17:49:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 833457 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="ilXxEc/S"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ySXjP5g65z9sMN for ; Fri, 3 Nov 2017 04:52:25 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933197AbdKBRwK (ORCPT ); Thu, 2 Nov 2017 13:52:10 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:55461 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933566AbdKBRt4 (ORCPT ); Thu, 2 Nov 2017 13:49:56 -0400 Received: by mail-wr0-f196.google.com with SMTP id l8so310993wre.12; Thu, 02 Nov 2017 10:49:55 -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=1v7N1xW/MatGRoTXVb0Y3M4t9mCvv0SJKgqvgG2ZmMM=; b=ilXxEc/S2+4crq1i9ZwSzAZj6cqQclHcqKPzkLx4rALp2Rp9XOBj/EPJuYkW/uX0z0 ESiSs51wmLJejInAmG8KtD65FtUNZ3MH7S4GmKSJOn1+40elT0b0lvFfCbPATaD0HdoX +EYJn9BfTcjDk7x/mSLWbHmUO9vGb2RgqZGj1SunwDZEQAReRPxr9J4dB7HwKTCQ9DEu +uJV0r1ZMuUIY2T3Y1zMYfH9677ImnZX74XZ9chxTGuuoOUBtLYiX3se50fANYprEQji yes09A42roRX17bqBx745T99M62YsdYT0HL2axZNyAbh8JqGAs/wIfMK15X4pV6izKnX AryQ== 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=1v7N1xW/MatGRoTXVb0Y3M4t9mCvv0SJKgqvgG2ZmMM=; b=RbtH5KcNw/JPcQdtVj9EQqa2ne1ss6ZuRC/F00wkVgOHvt7DquEFBmGYsq803rbpCy vCaeUjvNoXwtJKoTAf0Gqg6hXsmuGZS4X+JiMAxZ5Usrqjk51Wl6s4YKPb2/uLNtU9Mf fsLCdUue4+CS4HG7OH/3WRdPo+nig6s95qXBeX+1pXqzm/IJ/BYEXa2oKTcQBd/gb4Gj VEAQuy3iP1fpI3QoFlUWlS4YJkgGVtdW8BByCWCHVF/gD40N/btpjcowaf0piIrGqv0R 7d69nQasQ/hLA3olo+48YAjEwOWttjopc3Br653VAtc518o7y7zqOS4yh5MSY/cdBMGe c9Pg== X-Gm-Message-State: AMCzsaUOpQpHtedjUK2Q277eNgna4gx2qdqQW3+feGS3QdTa4OA32776 spmMibnyWH/ysaM/2TNJyDM= X-Google-Smtp-Source: ABhQp+RJOKSy0xIajXgcHIaAPLwIZYwGf/593a+hozHJAiK47nnujXsWRMDONwWxlwxMO/MEMpx63A== X-Received: by 10.223.152.199 with SMTP id w65mr4063731wrb.254.1509644994506; Thu, 02 Nov 2017 10:49:54 -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 j2sm3513654wrj.82.2017.11.02.10.49.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 Nov 2017 10:49:53 -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 07/12] gpio: Move irq_nested into struct gpio_irq_chip Date: Thu, 2 Nov 2017 18:49:36 +0100 Message-Id: <20171102174941.3461-8-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 | 8 ++++---- include/linux/gpio/driver.h | 9 +++++++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 8eadae73ff20..236a9f55a265 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1614,7 +1614,7 @@ void gpiochip_set_nested_irqchip(struct gpio_chip *gpiochip, struct irq_chip *irqchip, unsigned int parent_irq) { - if (!gpiochip->irq_nested) { + if (!gpiochip->irq.nested) { chip_err(gpiochip, "tried to nest a chained gpiochip\n"); return; } @@ -1649,7 +1649,7 @@ static int gpiochip_irq_map(struct irq_domain *d, unsigned int irq, irq_set_lockdep_class(irq, chip->lock_key); 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) + if (chip->irq.nested) irq_set_nested_thread(irq, 1); irq_set_noprobe(irq); @@ -1667,7 +1667,7 @@ static void gpiochip_irq_unmap(struct irq_domain *d, unsigned int irq) { struct gpio_chip *chip = d->host_data; - if (chip->irq_nested) + if (chip->irq.nested) irq_set_nested_thread(irq, 0); irq_set_chip_and_handler(irq, NULL, NULL); irq_set_chip_data(irq, NULL); @@ -1801,7 +1801,7 @@ int gpiochip_irqchip_add_key(struct gpio_chip *gpiochip, pr_err("missing gpiochip .dev parent pointer\n"); return -EINVAL; } - gpiochip->irq_nested = nested; + gpiochip->irq.nested = nested; of_node = gpiochip->parent->of_node; #ifdef CONFIG_OF_GPIO /* diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h index 86f00d908e90..1c3d06fe54b1 100644 --- a/include/linux/gpio/driver.h +++ b/include/linux/gpio/driver.h @@ -92,6 +92,13 @@ struct gpio_irq_chip { * driver, so the core will only reference this list, not modify it. */ unsigned int *parents; + + /** + * @nested: + * + * True if set the interrupt handling is nested. + */ + bool nested; }; static inline struct gpio_irq_chip *to_gpio_irq_chip(struct irq_chip *chip) @@ -163,7 +170,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_nested: True if set the interrupt handling is nested. * @irq_need_valid_mask: If set core allocates @irq_valid_mask with all * bits set to one * @irq_valid_mask: If not %NULL holds bitmask of GPIOs which are valid to @@ -238,7 +244,6 @@ struct gpio_chip { * With CONFIG_GPIOLIB_IRQCHIP we get an irqchip inside the gpiolib * to handle IRQs for most practical cases. */ - bool irq_nested; bool irq_need_valid_mask; unsigned long *irq_valid_mask; struct lock_class_key *lock_key;