From: Lee Jones <lee.jones@linaro.org>
To: Linus Walleij <linus.walleij@linaro.org>
Cc: Samuel Ortiz <sameo@linux.intel.com>,
linux-kernel@vger.kernel.org, Ben Dooks <ben@fluff.org.uk>
Subject: Re: [PATCH 5/9] mfd: sm501: Use gpiochip data pointer
Date: Mon, 11 Apr 2016 12:48:44 +0100 [thread overview]
Message-ID: <20160411114844.GO8094@x1> (raw)
In-Reply-To: <1459327689-12786-6-git-send-email-linus.walleij@linaro.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: Ben Dooks <ben@fluff.org.uk>
> Acked-by: Lee Jones <lee.jones@linaro.org>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> drivers/mfd/sm501.c | 15 +++++----------
> 1 file changed, 5 insertions(+), 10 deletions(-)
Applied, thanks.
> diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c
> index c646784c5a7d..65cd0d2a822a 100644
> --- a/drivers/mfd/sm501.c
> +++ b/drivers/mfd/sm501.c
> @@ -879,11 +879,6 @@ static int sm501_register_display(struct sm501_devdata *sm,
>
> #ifdef CONFIG_MFD_SM501_GPIO
>
> -static inline struct sm501_gpio_chip *to_sm501_gpio(struct gpio_chip *gc)
> -{
> - return container_of(gc, struct sm501_gpio_chip, gpio);
> -}
> -
> static inline struct sm501_devdata *sm501_gpio_to_dev(struct sm501_gpio *gpio)
> {
> return container_of(gpio, struct sm501_devdata, gpio);
> @@ -892,7 +887,7 @@ static inline struct sm501_devdata *sm501_gpio_to_dev(struct sm501_gpio *gpio)
> static int sm501_gpio_get(struct gpio_chip *chip, unsigned offset)
>
> {
> - struct sm501_gpio_chip *smgpio = to_sm501_gpio(chip);
> + struct sm501_gpio_chip *smgpio = gpiochip_get_data(chip);
> unsigned long result;
>
> result = smc501_readl(smgpio->regbase + SM501_GPIO_DATA_LOW);
> @@ -923,7 +918,7 @@ static void sm501_gpio_ensure_gpio(struct sm501_gpio_chip *smchip,
> static void sm501_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
>
> {
> - struct sm501_gpio_chip *smchip = to_sm501_gpio(chip);
> + struct sm501_gpio_chip *smchip = gpiochip_get_data(chip);
> struct sm501_gpio *smgpio = smchip->ourgpio;
> unsigned long bit = 1 << offset;
> void __iomem *regs = smchip->regbase;
> @@ -948,7 +943,7 @@ static void sm501_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
>
> static int sm501_gpio_input(struct gpio_chip *chip, unsigned offset)
> {
> - struct sm501_gpio_chip *smchip = to_sm501_gpio(chip);
> + struct sm501_gpio_chip *smchip = gpiochip_get_data(chip);
> struct sm501_gpio *smgpio = smchip->ourgpio;
> void __iomem *regs = smchip->regbase;
> unsigned long bit = 1 << offset;
> @@ -974,7 +969,7 @@ static int sm501_gpio_input(struct gpio_chip *chip, unsigned offset)
> static int sm501_gpio_output(struct gpio_chip *chip,
> unsigned offset, int value)
> {
> - struct sm501_gpio_chip *smchip = to_sm501_gpio(chip);
> + struct sm501_gpio_chip *smchip = gpiochip_get_data(chip);
> struct sm501_gpio *smgpio = smchip->ourgpio;
> unsigned long bit = 1 << offset;
> void __iomem *regs = smchip->regbase;
> @@ -1039,7 +1034,7 @@ static int sm501_gpio_register_chip(struct sm501_devdata *sm,
> gchip->base = base;
> chip->ourgpio = gpio;
>
> - return gpiochip_add(gchip);
> + return gpiochip_add_data(gchip, chip);
> }
>
> static int sm501_register_gpio(struct sm501_devdata *sm)
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
next prev parent reply other threads:[~2016-04-11 11:48 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-30 8:48 [PATCH 0/9] Use GPIO data pointer in MFD Linus Walleij
2016-03-30 8:48 ` [PATCH 1/9] mfd: asic3: Use gpiochip data pointer Linus Walleij
2016-04-11 11:47 ` Lee Jones
2016-03-30 8:48 ` [PATCH 2/9] mfd: dm355evm_msp: Switch to gpiochip_add_data() Linus Walleij
2016-04-11 11:48 ` Lee Jones
2016-03-30 8:48 ` [PATCH 3/9] mfd: htc-egpio: Use gpiochip data pointer Linus Walleij
2016-04-11 11:48 ` Lee Jones
2016-03-30 8:48 ` [PATCH 4/9] mfd: htc-i2cpld: " Linus Walleij
2016-04-11 11:48 ` Lee Jones
2016-03-30 8:48 ` [PATCH 5/9] mfd: sm501: " Linus Walleij
2016-04-11 11:48 ` Lee Jones [this message]
2016-03-30 8:48 ` [PATCH 6/9] mfd: tc6393xb: " Linus Walleij
2016-03-31 10:15 ` Dmitry Eremin-Solenikov
2016-04-11 11:49 ` Lee Jones
2016-03-30 8:48 ` [PATCH 7/9] mfd: tps65010: " Linus Walleij
2016-04-11 11:48 ` Lee Jones
2016-03-30 8:48 ` [PATCH 8/9] mfd: ucb1x00: " Linus Walleij
2016-04-11 11:49 ` Lee Jones
2016-03-30 8:48 ` [PATCH 9/9] mfd: vexpress-sysreg: Switch to gpiochip_add_data() Linus Walleij
2016-04-11 11:49 ` Lee Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160411114844.GO8094@x1 \
--to=lee.jones@linaro.org \
--cc=ben@fluff.org.uk \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sameo@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.