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
Subject: Re: [PATCH 4/9] mfd: htc-i2cpld: Use gpiochip data pointer
Date: Mon, 11 Apr 2016 12:48:28 +0100 [thread overview]
Message-ID: <20160411114828.GN8094@x1> (raw)
In-Reply-To: <1459327689-12786-5-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().
>
> Acked-by: Lee Jones <lee.jones@linaro.org>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> drivers/mfd/htc-i2cpld.c | 15 +++++----------
> 1 file changed, 5 insertions(+), 10 deletions(-)
Applied, thanks.
> diff --git a/drivers/mfd/htc-i2cpld.c b/drivers/mfd/htc-i2cpld.c
> index bd6b96d07ab8..3f9eee5f8fb9 100644
> --- a/drivers/mfd/htc-i2cpld.c
> +++ b/drivers/mfd/htc-i2cpld.c
> @@ -227,8 +227,7 @@ static irqreturn_t htcpld_handler(int irq, void *dev)
> static void htcpld_chip_set(struct gpio_chip *chip, unsigned offset, int val)
> {
> struct i2c_client *client;
> - struct htcpld_chip *chip_data =
> - container_of(chip, struct htcpld_chip, chip_out);
> + struct htcpld_chip *chip_data = gpiochip_get_data(chip);
> unsigned long flags;
>
> client = chip_data->client;
> @@ -257,14 +256,12 @@ static void htcpld_chip_set_ni(struct work_struct *work)
>
> static int htcpld_chip_get(struct gpio_chip *chip, unsigned offset)
> {
> - struct htcpld_chip *chip_data;
> + struct htcpld_chip *chip_data = gpiochip_get_data(chip);
> u8 cache;
>
> if (!strncmp(chip->label, "htcpld-out", 10)) {
> - chip_data = container_of(chip, struct htcpld_chip, chip_out);
> cache = chip_data->cache_out;
> } else if (!strncmp(chip->label, "htcpld-in", 9)) {
> - chip_data = container_of(chip, struct htcpld_chip, chip_in);
> cache = chip_data->cache_in;
> } else
> return -EINVAL;
> @@ -291,9 +288,7 @@ static int htcpld_direction_input(struct gpio_chip *chip,
>
> static int htcpld_chip_to_irq(struct gpio_chip *chip, unsigned offset)
> {
> - struct htcpld_chip *chip_data;
> -
> - chip_data = container_of(chip, struct htcpld_chip, chip_in);
> + struct htcpld_chip *chip_data = gpiochip_get_data(chip);
>
> if (offset < chip_data->nirqs)
> return chip_data->irq_start + offset;
> @@ -451,14 +446,14 @@ static int htcpld_register_chip_gpio(
> gpio_chip->ngpio = plat_chip_data->num_gpios;
>
> /* Add the GPIO chips */
> - ret = gpiochip_add(&(chip->chip_out));
> + ret = gpiochip_add_data(&(chip->chip_out), chip);
> if (ret) {
> dev_warn(dev, "Unable to register output GPIOs for 0x%x: %d\n",
> plat_chip_data->addr, ret);
> return ret;
> }
>
> - ret = gpiochip_add(&(chip->chip_in));
> + ret = gpiochip_add_data(&(chip->chip_in), chip);
> if (ret) {
> dev_warn(dev, "Unable to register input GPIOs for 0x%x: %d\n",
> plat_chip_data->addr, ret);
--
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 [this message]
2016-03-30 8:48 ` [PATCH 5/9] mfd: sm501: " Linus Walleij
2016-04-11 11:48 ` Lee Jones
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=20160411114828.GN8094@x1 \
--to=lee.jones@linaro.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox