Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754604AbcDKLtL (ORCPT ); Mon, 11 Apr 2016 07:49:11 -0400 Received: from mail-wm0-f41.google.com ([74.125.82.41]:34008 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753332AbcDKLtI (ORCPT ); Mon, 11 Apr 2016 07:49:08 -0400 Date: Mon, 11 Apr 2016 12:49:04 +0100 From: Lee Jones To: Linus Walleij Cc: Samuel Ortiz , linux-kernel@vger.kernel.org Subject: Re: [PATCH 8/9] mfd: ucb1x00: Use gpiochip data pointer Message-ID: <20160411114904.GQ8094@x1> References: <1459327689-12786-1-git-send-email-linus.walleij@linaro.org> <1459327689-12786-9-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-9-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 Content-Length: 3229 Lines: 87 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(). > > Acked-by: Lee Jones > Signed-off-by: Linus Walleij > --- > drivers/mfd/ucb1x00-core.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) Applied, thanks. > diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c > index bcafe1ecd71c..9ab9ec47ea75 100644 > --- a/drivers/mfd/ucb1x00-core.c > +++ b/drivers/mfd/ucb1x00-core.c > @@ -28,7 +28,7 @@ > #include > #include > #include > -#include > +#include > > static DEFINE_MUTEX(ucb1x00_mutex); > static LIST_HEAD(ucb1x00_drivers); > @@ -109,7 +109,7 @@ unsigned int ucb1x00_io_read(struct ucb1x00 *ucb) > > static void ucb1x00_gpio_set(struct gpio_chip *chip, unsigned offset, int value) > { > - struct ucb1x00 *ucb = container_of(chip, struct ucb1x00, gpio); > + struct ucb1x00 *ucb = gpiochip_get_data(chip); > unsigned long flags; > > spin_lock_irqsave(&ucb->io_lock, flags); > @@ -126,7 +126,7 @@ static void ucb1x00_gpio_set(struct gpio_chip *chip, unsigned offset, int value) > > static int ucb1x00_gpio_get(struct gpio_chip *chip, unsigned offset) > { > - struct ucb1x00 *ucb = container_of(chip, struct ucb1x00, gpio); > + struct ucb1x00 *ucb = gpiochip_get_data(chip); > unsigned val; > > ucb1x00_enable(ucb); > @@ -138,7 +138,7 @@ static int ucb1x00_gpio_get(struct gpio_chip *chip, unsigned offset) > > static int ucb1x00_gpio_direction_input(struct gpio_chip *chip, unsigned offset) > { > - struct ucb1x00 *ucb = container_of(chip, struct ucb1x00, gpio); > + struct ucb1x00 *ucb = gpiochip_get_data(chip); > unsigned long flags; > > spin_lock_irqsave(&ucb->io_lock, flags); > @@ -154,7 +154,7 @@ static int ucb1x00_gpio_direction_input(struct gpio_chip *chip, unsigned offset) > static int ucb1x00_gpio_direction_output(struct gpio_chip *chip, unsigned offset > , int value) > { > - struct ucb1x00 *ucb = container_of(chip, struct ucb1x00, gpio); > + struct ucb1x00 *ucb = gpiochip_get_data(chip); > unsigned long flags; > unsigned old, mask = 1 << offset; > > @@ -181,7 +181,7 @@ static int ucb1x00_gpio_direction_output(struct gpio_chip *chip, unsigned offset > > static int ucb1x00_to_irq(struct gpio_chip *chip, unsigned offset) > { > - struct ucb1x00 *ucb = container_of(chip, struct ucb1x00, gpio); > + struct ucb1x00 *ucb = gpiochip_get_data(chip); > > return ucb->irq_base > 0 ? ucb->irq_base + offset : -ENXIO; > } > @@ -579,7 +579,7 @@ static int ucb1x00_probe(struct mcp *mcp) > ucb->gpio.direction_input = ucb1x00_gpio_direction_input; > ucb->gpio.direction_output = ucb1x00_gpio_direction_output; > ucb->gpio.to_irq = ucb1x00_to_irq; > - ret = gpiochip_add(&ucb->gpio); > + ret = gpiochip_add_data(&ucb->gpio, ucb); > if (ret) > goto err_gpio_add; > } else -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog