From patchwork Thu Sep 28 09:56:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 819508 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="SWiZ4awm"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y2qsZ1dB7z9t5Y for ; Thu, 28 Sep 2017 19:59:14 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753031AbdI1J7A (ORCPT ); Thu, 28 Sep 2017 05:59:00 -0400 Received: from mail-qk0-f194.google.com ([209.85.220.194]:33826 "EHLO mail-qk0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752867AbdI1J4y (ORCPT ); Thu, 28 Sep 2017 05:56:54 -0400 Received: by mail-qk0-f194.google.com with SMTP id d70so651217qkc.1; Thu, 28 Sep 2017 02:56:54 -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=lauJTMVnvUbbgRaHR4hOjI8pwXek0yeu+kiFChNq/+M=; b=SWiZ4awm/0GnKP1bBPM4IwApl99LUvRDLRdVyXRKgDIzXuNJ+dzYLe0r4Dsy3qjyKL 2mBd2Xi7bjbPWi6ILj3DalanHKmvOMhnpGZX2jzZnDpXClzix3SVnHJGzLBWEo339vBa qSoq7mfGm93ipDaMW/3yO3x9nNEqywT7QJHeVbyglgQxIYQPhIoT8mDq/3yzOk5cXB0G X8qphqRKBCCDxUeem9F63h5OpkOqBiqy7KzD4KE5VPu80VE+ezdvCv9nnAy+VqlywuRF OLOhp9alHoCX5ciEIXGRNL7ToCxXBYiSfjDziWOgRm9dgRVzStrO9sn9cSP2E38Oywl/ 11zA== 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=lauJTMVnvUbbgRaHR4hOjI8pwXek0yeu+kiFChNq/+M=; b=qDfYWYxeH912L82pwUFrPXaozfqjLh8MOv1TECpGPTjUWCE18B83oKNItYvjxt88T1 u5OMuiTolvkjR+oXYcxXfKxR0PpGTCilei0VevuUYOD9A81DP5N/mEaqHwobPgbw7iOr JlCx4Pcm0LId0C4CQvGp7BvvY+UXe8jZcAJ4/oOnA2vaqbxqCL4XRpAXpy/ojIkb7GjJ jKUHFm8/zGyHONt5a6/LIFnF3/7tcZ0PmmTVvAIBH8heiOgdnepOKiiNbG1RGdTMwfqK O7+a8vXuB3ADKEOyQ8IbcnzrLyMmmeAWZHzN2YZr/duXn20e39jfDjeWKIwSJ9D2YtSD 3TlQ== X-Gm-Message-State: AHPjjUg3ldiRULnjpDjWgvQZhhbw6nDutduRmwF0nfLxGrq/PuGReDTf Rz+OENsIcXnSSBxNHg8S+CM= X-Google-Smtp-Source: AOwi7QCniPYDTAZOJ+rEay9VMEQYxmi9AV08uJ+/oUu868hwWCYHhk71Mzmi5Llsq7yhd9bndefUDQ== X-Received: by 10.55.3.67 with SMTP id 64mr5806612qkd.307.1506592613630; Thu, 28 Sep 2017 02:56:53 -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 t184sm720979qkc.74.2017.09.28.02.56.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Sep 2017 02:56:53 -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 08/16] gpio: Move irq_nested into struct gpio_irq_chip Date: Thu, 28 Sep 2017 11:56:20 +0200 Message-Id: <20170928095628.21966-9-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 | 12 ++++++------ include/linux/gpio/driver.h | 9 +++++++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 7a62f4a63635..eaca1ccd2431 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1613,7 +1613,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; } @@ -1648,7 +1648,7 @@ 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 @@ 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); @@ -1800,9 +1800,9 @@ static int gpiochip_add_irqchip(struct gpio_chip *gpiochip) data); } - gpiochip->irq_nested = false; + gpiochip->irq.nested = false; } else { - gpiochip->irq_nested = true; + gpiochip->irq.nested = true; } /* @@ -1919,7 +1919,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 c3eafd874884..7d632a8932be 100644 --- a/include/linux/gpio/driver.h +++ b/include/linux/gpio/driver.h @@ -107,6 +107,13 @@ struct gpio_irq_chip { * A list of interrupt parents for each line of a GPIO chip. */ unsigned int *map; + + /** + * @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) @@ -176,7 +183,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 @@ -248,7 +254,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;