From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753763AbcDKLsF (ORCPT ); Mon, 11 Apr 2016 07:48:05 -0400 Received: from mail-wm0-f48.google.com ([74.125.82.48]:37304 "EHLO mail-wm0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750925AbcDKLsD (ORCPT ); Mon, 11 Apr 2016 07:48:03 -0400 Date: Mon, 11 Apr 2016 12:47:58 +0100 From: Lee Jones To: Linus Walleij Cc: Samuel Ortiz , linux-kernel@vger.kernel.org, Paul Parsons Subject: Re: [PATCH 1/9] mfd: asic3: Use gpiochip data pointer Message-ID: <20160411114758.GK8094@x1> References: <1459327689-12786-1-git-send-email-linus.walleij@linaro.org> <1459327689-12786-2-git-send-email-linus.walleij@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1459327689-12786-2-git-send-email-linus.walleij@linaro.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 30 Mar 2016, Linus Walleij wrote: > 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: Paul Parsons > Acked-by: Lee Jones > Signed-off-by: Linus Walleij > --- > drivers/mfd/asic3.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) Applied, thanks. > diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c > index 4dca6bc61f5b..0413c8159551 100644 > --- a/drivers/mfd/asic3.c > +++ b/drivers/mfd/asic3.c > @@ -446,7 +446,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) { > @@ -492,7 +492,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) { > @@ -540,7 +540,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; > } > @@ -595,7 +595,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) -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog