From patchwork Thu Sep 28 09:56:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 819505 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="lsTFUGaB"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y2qs62Wdpz9t5Y for ; Thu, 28 Sep 2017 19:58:50 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752930AbdI1J6e (ORCPT ); Thu, 28 Sep 2017 05:58:34 -0400 Received: from mail-qk0-f196.google.com ([209.85.220.196]:33845 "EHLO mail-qk0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752902AbdI1J47 (ORCPT ); Thu, 28 Sep 2017 05:56:59 -0400 Received: by mail-qk0-f196.google.com with SMTP id d70so651305qkc.1; Thu, 28 Sep 2017 02:56:59 -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=yB2VnxaH7q0xVnggmX04kvbr5GKMqQKqZaAT8I+CBT8=; b=lsTFUGaBoJaiyph6Fat6Xclr/9sZI8JJ+gkegS04EjwbwlWO/0BZlfvHS/bcfNCxrX pUhXRjCCVB2qHL1E6Iix7+f9+EU+JR3gicv/cYNoJLxb+s9oe5i96n0MVKSVdP3//7zT QYYeoGOSpZ6dANoT2RXEUuOG0K3PzOHm7sYx5wRDFDOJ7pruwNCvMYFVvt0sBpOiBMlK RJOxj5gVrXwdKTsM4HAf8B+nuJQi0velQekb65kr8pm9fsTCCokf8aKp+Hvg3DIhh30F ywBOJnhM/1Dqp2B0OAjt/+GkwBb+IFmgTIQ9CG4mbc01O1wpRKOQE6T/x79YEZNK/t2b 0amg== 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=yB2VnxaH7q0xVnggmX04kvbr5GKMqQKqZaAT8I+CBT8=; b=eXPyBJC77tXW/RGo58dYmvJ+8e79764ezJ0urQaJ3xuXtlx7j4DA1ek6tlBYfYoaXX Qaa2dVbWwbkxiPdVKCRkQxZrv6U2gtOoAzGAshSvu/whE37TnxKYxijmrPfU9nUGK8KU oQYmMYDnIE4a5Zz+CzUrpizlWJyTTz4ZdMvmGzqFtZxMdZLXO3yw7+wqt+Ce5MrqMhM1 hQ5LY7jU64zaNC87/YLXqVyCm/1AZNLPEM/o2VDbOj0GR5IE6bGqtY38P7cJWYaxErvV 1laj/JPgPPUSlWDYscOByL/3WppLXaK7uNLzI9J5MSawcfNhSHUxTJJ9Iv8UeeI82y0b 9CvA== X-Gm-Message-State: AMCzsaXX3zQDBjKDTQ+hth/n5LVSBc4uexsOtDePZt6KYcutSePothZE /c3ILiSEW3MlFieHkmXRMKk= X-Google-Smtp-Source: AOwi7QAhZ91wf/YocpJzX0JVRO7kB3SV1BoSbOGJMZEn53pHU8UV0tb49tbg6D61W5EhPmpwCHtJUw== X-Received: by 10.55.5.21 with SMTP id 21mr5754171qkf.184.1506592618362; Thu, 28 Sep 2017 02:56:58 -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 x124sm728980qka.85.2017.09.28.02.56.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Sep 2017 02:56:57 -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 10/16] gpio: Move lock_key into struct gpio_irq_chip Date: Thu, 28 Sep 2017 11:56:22 +0200 Message-Id: <20170928095628.21966-11-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 | 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 4d140eb27d5b..c15fb858848a 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1645,7 +1645,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) @@ -1948,7 +1948,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 @@ -70,6 +70,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: * @@ -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: