From patchwork Tue Nov 7 18:15:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 835422 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="hEfLwJj+"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yWd4d60l8z9t2r for ; Wed, 8 Nov 2017 05:19:45 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751207AbdKGSS7 (ORCPT ); Tue, 7 Nov 2017 13:18:59 -0500 Received: from mail-wr0-f196.google.com ([209.85.128.196]:45993 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755851AbdKGSQN (ORCPT ); Tue, 7 Nov 2017 13:16:13 -0500 Received: by mail-wr0-f196.google.com with SMTP id y9so106269wrb.2; Tue, 07 Nov 2017 10:16:12 -0800 (PST) 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=riNbhBdhPhS638lLTaUHVSm+GxKax5lKz8gU89HZ2/E=; b=hEfLwJj+F1UE04NSzgnFgRZOxN4UTgY6IhdIT0aaMGXZhXUqz77XOwDXllOOZva/6x nlN+iX2jzYg79GyLC3yL7jLEZ6YakVSkOTUmyMwtA+mHydCTRKbjst/DiLlm0fmVKj8L TefcYf8EB5a1i8H68ao/YQTEoxzlVI6NaCwhqGHr2pSzkG0Umou29G4wtfaFro4MzpzT alQ9N7UjTfoy1QK4KUx6sOZTcHFySoy1vtzcc8bEUfu0MdMxMBMhjZnWNb0tcGU61ioa /WLdr2lVlr1rQV+H3NnuAujSntD5RtKvjFb+FvtznvNxOecqUHoLIhGvkhSzZPVGlJ7C mu4g== 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=riNbhBdhPhS638lLTaUHVSm+GxKax5lKz8gU89HZ2/E=; b=CyJePsdvh5birHo9LIvGR2aPfXh8BUIAxQ3YmPafzSbhooimtxbbl3BMVETgL0iZaY oCxvXNoUlGiwYsp6fty00rvk51LiQNayYg3V/PU0/ycDFp0uvaWUoHq49JSPtZI+gL7A mAwurl3TU14k8rvIy5QLNZ30drUcb92+gBwYp3G4Dp/8NDKGdWIK4btd9FFL/Fd/SWjz twsTF5qTBxO/1sRPsYB1me2NHYBueGaSPTKx8rdTUag/avOe0UOXrjmNwCUQHmEz/9xk DsCAPxs2u1IylDzeHHsxQ/E9AkRsi5tE0PBtTaJ42if/yCs6H0R5WqVhOn9LWsECgNcT vRCA== X-Gm-Message-State: AMCzsaUrjjhPKzIKIl1mVweZzKeQ8x855xwsa0OPbS/a4Kr7+wRaKACe OEjpYYzufpQykqdz139JRwY= X-Google-Smtp-Source: ABhQp+TPuoyVIKcxv2zO7/5Z4Yto5zhIQTZukg4IAyqj86UCoG9Apm+Fly7mjufkqpKPXv7mVsLQEQ== X-Received: by 10.223.139.10 with SMTP id n10mr17501182wra.156.1510078571902; Tue, 07 Nov 2017 10:16:11 -0800 (PST) Received: from localhost (p200300E41BC8E9001FF851737372D2C2.dip0.t-ipconnect.de. [2003:e4:1bc8:e900:1ff8:5173:7372:d2c2]) by smtp.gmail.com with ESMTPSA id 10sm1696403wml.27.2017.11.07.10.16.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 07 Nov 2017 10:16:11 -0800 (PST) From: Thierry Reding To: Linus Walleij , Grygorii Strashko Cc: Jonathan Hunter , linux-gpio@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v7 07/15] gpio: Move irq_nested into struct gpio_irq_chip Date: Tue, 7 Nov 2017 19:15:51 +0100 Message-Id: <20171107181559.6318-8-thierry.reding@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171107181559.6318-1-thierry.reding@gmail.com> References: <20171107181559.6318-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 3edb02b54bb2..62d6e146dde1 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 4210aa4c11d1..23f9feb266cf 100644 --- a/include/linux/gpio/driver.h +++ b/include/linux/gpio/driver.h @@ -93,6 +93,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) @@ -164,7 +171,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 @@ -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. */ - bool irq_nested; bool irq_need_valid_mask; unsigned long *irq_valid_mask; struct lock_class_key *lock_key;