From patchwork Fri Sep 1 18:57:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 808961 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="Lv1CGIXL"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xkT8B1gNtz9sRV for ; Sat, 2 Sep 2017 05:00:10 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752600AbdIAS76 (ORCPT ); Fri, 1 Sep 2017 14:59:58 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:34193 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752529AbdIAS56 (ORCPT ); Fri, 1 Sep 2017 14:57:58 -0400 Received: by mail-wr0-f194.google.com with SMTP id z91so491086wrc.1; Fri, 01 Sep 2017 11:57:57 -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=25+pnbNESp32IKEPd1h621dfT9rkNInvAAy5fR9GZvI=; b=Lv1CGIXLNfbezDYeg1Lv1tTqMdUe392DP5Uh+DKK4bnw4kuDoL3FhCsZaXuN9d2BYC WTXrAib+Q4JuI1HvZWPXjdLwNMFkI5bYN9LrtOCYFJvn77SE9GVBDd6AsCsT4ZW6/H5l QuM4P2Vn6Y8hIYBpmg1Vqu8tUrU5VTMu1cHEpz23zawAQcruuvOnx+VeQxhiuJaZcYra e752qZrM/sxW2fdH3tP/zGKGeyIEZ36Wzr3hYZFCQZypJRHNH+9oa03doYT+0JKA8YsH 9/DGlC8xADwSal0sL1nXRcuuuRAmDd1QV83Sf0SM90uBGTNoYB0lkkVSUYQyyEFaZMO8 EYmQ== 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=25+pnbNESp32IKEPd1h621dfT9rkNInvAAy5fR9GZvI=; b=IKMCFmhYCDrZQ6z8WDyyf9GtFmpTorm+ANb0LRytVT2Gj1mSaaC02AylsMjltwkDB6 eaCEjePqCGHjtWpT00G8YdC0mUVaES+35rkza96eS9tfWTJB6y01JPrNWL9jySR5h74G 5kk3NjgQr2Fqm/oLwIarjBI9rZv7VJV00OgdV/rdQ51x7F65qq/8oDEfVeMUAOdz+GNQ 7tm2ePgmRl990VFH+r7LdFWr/gkrMBhs1PoIgGi6+5OOdbmt0eMruGZ/4qoVF8LYSvEw dXMUK5F+NUkOe0k5jyVOioAvVVhhWCOCEBeadRYIZosaLL7XcOU+s+/pVTrMxmP9GQPi WQKg== X-Gm-Message-State: AHPjjUgI9WdECQhONGGnNsw7OTunxiBeyeg7DfJKk3DUuF7E70i0SzoX YAe/CPlcK6XvZw== X-Google-Smtp-Source: ADKCNb5a2iVls4A5b/+WYRhRfaZyxB1DRhsXON/hyQKhdqwwklEBMdd7OtE8n+z3XaPTFKxdRHFFaA== X-Received: by 10.223.176.203 with SMTP id j11mr1986034wra.26.1504292276915; Fri, 01 Sep 2017 11:57:56 -0700 (PDT) Received: from localhost (p200300E41BD6D60076D02BFFFE273F51.dip0.t-ipconnect.de. [2003:e4:1bd6:d600:76d0:2bff:fe27:3f51]) by smtp.gmail.com with ESMTPSA id 6sm717925wre.0.2017.09.01.11.57.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Sep 2017 11:57:56 -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 10/16] gpio: Move lock_key into struct gpio_irq_chip Date: Fri, 1 Sep 2017 20:57:30 +0200 Message-Id: <20170901185736.28051-11-thierry.reding@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170901185736.28051-1-thierry.reding@gmail.com> References: <20170901185736.28051-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 | 4 ++-- include/linux/gpio/driver.h | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 6cec36126f44..7a16dd37bd3d 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1656,7 +1656,7 @@ int gpiochip_irq_map(struct irq_domain *d, unsigned int irq, * This lock class tells lockdep that GPIO irqs are in a different * category than their parents, so it won't report false recursion. */ - irq_set_lockdep_class(irq, chip->lock_key); + irq_set_lockdep_class(irq, chip->irq.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) @@ -1959,7 +1959,7 @@ int gpiochip_irqchip_add_key(struct gpio_chip *gpiochip, gpiochip->irq.handler = handler; gpiochip->irq.default_type = type; gpiochip->to_irq = gpiochip_to_irq; - gpiochip->lock_key = lock_key; + gpiochip->irq.lock_key = lock_key; gpiochip->irq.domain = irq_domain_add_simple(of_node, gpiochip->ngpio, first_irq, &gpiochip_domain_ops, gpiochip); diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h index f8d31e7da9cc..c453e0716228 100644 --- a/include/linux/gpio/driver.h +++ b/include/linux/gpio/driver.h @@ -71,6 +71,13 @@ struct gpio_irq_chip { unsigned int default_type; /** + * @lock_key: + * + * Per GPIO IRQ chip lockdep class. + */ + struct lock_class_key *lock_key; + + /** * @parent_handler: * * The interrupt handler for the GPIO chip's parent interrupts, may be @@ -198,7 +205,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. - * @lock_key: per GPIO IRQ chip lockdep class * * A gpio_chip can help platforms abstract various sources of GPIOs so * they can all be accessed through a common programing interface. @@ -265,7 +271,6 @@ struct gpio_chip { * With CONFIG_GPIOLIB_IRQCHIP we get an irqchip inside the gpiolib * to handle IRQs for most practical cases. */ - struct lock_class_key *lock_key; /** * @irq: