From patchwork Wed Dec 9 13:47:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 58117 Delivered-To: patch@linaro.org Received: by 10.112.147.194 with SMTP id tm2csp679197lbb; Wed, 9 Dec 2015 05:47:28 -0800 (PST) X-Received: by 10.66.55.105 with SMTP id r9mr8009993pap.137.1449668848753; Wed, 09 Dec 2015 05:47:28 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qj4si12857243pac.33.2015.12.09.05.47.28; Wed, 09 Dec 2015 05:47:28 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-gpio-owner@vger.kernel.org; dkim=neutral (body hash did not verify) header.i=@linaro-org.20150623.gappssmtp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754148AbbLINr1 (ORCPT + 4 others); Wed, 9 Dec 2015 08:47:27 -0500 Received: from mail-lb0-f180.google.com ([209.85.217.180]:36255 "EHLO mail-lb0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753083AbbLINr1 (ORCPT ); Wed, 9 Dec 2015 08:47:27 -0500 Received: by lbblt2 with SMTP id lt2so30405385lbb.3 for ; Wed, 09 Dec 2015 05:47:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=dkzi8LwKMh2mtA2lH67/oUEk07Jcg2tkWzEV5Pn6EZA=; b=iQia7jEWiieRf4Vx2TQjwmBHq951BeUpksNqS9mQtV/sL2XajczYPc3WR/k9f/6AWB 2X0tF59aVaSAeyekN3Z1+/Uz8mEGDRIThAp7T8n/efoW0pyUjp75UrECANzlhRZpKEGQ i7phNxnwMQCcvJw5I4Ek/BPm6MA7dJvSdvCQkKcXsAhmyxBD14+5lvg7iT9pntAOzUe9 fAqM8lWLpWu0Nxdar7WROSc5Eo7Cqf00HSYa5UZufazlm8JoTHdir2SnRTPIMeda8hoe kWNfQv6G4iBi62ZkODCQBMIW4nZBBifnBeaKvrA6p7BTLVx8N/3r9zZ0qhpPmSEch2LS Lmkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=dkzi8LwKMh2mtA2lH67/oUEk07Jcg2tkWzEV5Pn6EZA=; b=fuWDXPrseJQMpQsvBneYsB1htJpLaPt5a/II6qiPeqId6xTS/1z+KM3J86p7n+Wfq+ 1BM79nADz2/wr5nEHA7GGzglWdcW2GoosFY0degsivytPiIR6KtgmzEEjhcTLJ0s/4v8 paIfTsNlIqbYpp9meWiY+PwuHPu3DNaGHwcHGkTJjpxbR17eaujLqvNxFeaUOVkVdAEw /fOIYk50LF5ljRLdRd8YmGMsLH2BhsqTqFjj2u+kfNYP7+Uwm48HNsPfrFHTFeCh83oL ayGo4xRGMYDsg1RJMSTmTkr1pnaL3ngsogoSgb/NODxuDSuu4M3n7dsHC2aqhk8jEbdS fSlw== X-Gm-Message-State: ALoCoQm7LdWTYdKaa0JUsdp2bk+YiJjBsmLEbwrqhnUH8BgCl7WAyhmxx3Xqc7i7eQ/zDpgk7zO0svp/OVwyM+rGOqucZ1+4UA== X-Received: by 10.112.77.98 with SMTP id r2mr2004082lbw.124.1449668845689; Wed, 09 Dec 2015 05:47:25 -0800 (PST) Received: from localhost.localdomain ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id s63sm1436788lfd.31.2015.12.09.05.47.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Dec 2015 05:47:24 -0800 (PST) From: Linus Walleij To: linux-gpio@vger.kernel.org, Johan Hovold , Alexandre Courbot , Michael Welling , Markus Pargmann , Lee Jones Cc: Linus Walleij , Paul Parsons Subject: [PATCH 161/182] mfd: asic3: use gpiochip data pointer Date: Wed, 9 Dec 2015 14:47:22 +0100 Message-Id: <1449668842-6166-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.3 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org This makes the driver use the data pointer added to the gpio_chip to store a pointer to the state container instead of relying on container_of(). Cc: Lee Jones Cc: Paul Parsons Signed-off-by: Linus Walleij --- Lee please ACK this so I can take it through the GPIO tree. I want to try to optimistically merge these changes without any immutable branches, as I suspect other subsystem maintainers might not want to pull a branch with 200+ patches into each subsystem, but let's see what happens. --- drivers/mfd/asic3.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- 2.4.3 -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Acked-by: Lee Jones diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c index a726f01e3b02..013ba51de819 100644 --- a/drivers/mfd/asic3.c +++ b/drivers/mfd/asic3.c @@ -447,7 +447,7 @@ static int asic3_gpio_direction(struct gpio_chip *chip, unsigned long flags; struct asic3 *asic; - asic = container_of(chip, struct asic3, gpio); + asic = gpiochip_get_data(chip); gpio_base = ASIC3_GPIO_TO_BASE(offset); if (gpio_base > ASIC3_GPIO_D_BASE) { @@ -493,7 +493,7 @@ static int asic3_gpio_get(struct gpio_chip *chip, u32 mask = ASIC3_GPIO_TO_MASK(offset); struct asic3 *asic; - asic = container_of(chip, struct asic3, gpio); + asic = gpiochip_get_data(chip); gpio_base = ASIC3_GPIO_TO_BASE(offset); if (gpio_base > ASIC3_GPIO_D_BASE) { @@ -513,7 +513,7 @@ static void asic3_gpio_set(struct gpio_chip *chip, unsigned long flags; struct asic3 *asic; - asic = container_of(chip, struct asic3, gpio); + asic = gpiochip_get_data(chip); gpio_base = ASIC3_GPIO_TO_BASE(offset); if (gpio_base > ASIC3_GPIO_D_BASE) { @@ -542,7 +542,7 @@ static void asic3_gpio_set(struct gpio_chip *chip, static int asic3_gpio_to_irq(struct gpio_chip *chip, unsigned offset) { - struct asic3 *asic = container_of(chip, struct asic3, gpio); + struct asic3 *asic = gpiochip_get_data(chip); return asic->irq_base + offset; } @@ -597,7 +597,7 @@ static __init int asic3_gpio_probe(struct platform_device *pdev, alt_reg[i]); } - return gpiochip_add(&asic->gpio); + return gpiochip_add_data(&asic->gpio, asic); } static int asic3_gpio_remove(struct platform_device *pdev)