Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1367016

[PATCH 3/9] mfd: htc-egpio: Use gpiochip data pointer

Show all headers | View raw

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>
Acked-by: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 drivers/mfd/htc-egpio.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/mfd/htc-egpio.c b/drivers/mfd/htc-egpio.c
index c636b5f83cfb..513cfc5c8fb6 100644
--- a/drivers/mfd/htc-egpio.c
+++ b/drivers/mfd/htc-egpio.c
@@ -155,7 +155,7 @@ static int egpio_get(struct gpio_chip *chip, unsigned offset)
 
 	pr_debug("egpio_get_value(%d)\n", chip->base + offset);
 
-	egpio = container_of(chip, struct egpio_chip, chip);
+	egpio = gpiochip_get_data(chip);
 	ei    = dev_get_drvdata(egpio->dev);
 	bit   = egpio_bit(ei, offset);
 	reg   = egpio->reg_start + egpio_pos(ei, offset);
@@ -170,7 +170,7 @@ static int egpio_direction_input(struct gpio_chip *chip, unsigned offset)
 {
 	struct egpio_chip *egpio;
 
-	egpio = container_of(chip, struct egpio_chip, chip);
+	egpio = gpiochip_get_data(chip);
 	return test_bit(offset, &egpio->is_out) ? -EINVAL : 0;
 }
 
@@ -192,7 +192,7 @@ static void egpio_set(struct gpio_chip *chip, unsigned offset, int value)
 	pr_debug("egpio_set(%s, %d(%d), %d)\n",
 			chip->label, offset, offset+chip->base, value);
 
-	egpio = container_of(chip, struct egpio_chip, chip);
+	egpio = gpiochip_get_data(chip);
 	ei    = dev_get_drvdata(egpio->dev);
 	bit   = egpio_bit(ei, offset);
 	pos   = egpio_pos(ei, offset);
@@ -216,7 +216,7 @@ static int egpio_direction_output(struct gpio_chip *chip,
 {
 	struct egpio_chip *egpio;
 
-	egpio = container_of(chip, struct egpio_chip, chip);
+	egpio = gpiochip_get_data(chip);
 	if (test_bit(offset, &egpio->is_out)) {
 		egpio_set(chip, offset, value);
 		return 0;
@@ -330,7 +330,7 @@ static int __init egpio_probe(struct platform_device *pdev)
 		chip->base            = pdata->chip[i].gpio_base;
 		chip->ngpio           = pdata->chip[i].num_gpios;
 
-		gpiochip_add(chip);
+		gpiochip_add_data(chip, &ei->chip[i]);
 	}
 
 	/* Set initial pin values */
-- 
2.4.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/9] Use GPIO data pointer in MFD Linus Walleij <linus.walleij@linaro.org> - 2016-03-30 10:50 +0200
  [PATCH 9/9] mfd: vexpress-sysreg: Switch to gpiochip_add_data() Linus Walleij <linus.walleij@linaro.org> - 2016-03-30 10:50 +0200
  [PATCH 2/9] mfd: dm355evm_msp: Switch to gpiochip_add_data() Linus Walleij <linus.walleij@linaro.org> - 2016-03-30 10:50 +0200
  [PATCH 5/9] mfd: sm501: Use gpiochip data pointer Linus Walleij <linus.walleij@linaro.org> - 2016-03-30 10:50 +0200
  [PATCH 6/9] mfd: tc6393xb: Use gpiochip data pointer Linus Walleij <linus.walleij@linaro.org> - 2016-03-30 10:50 +0200
    Re: [PATCH 6/9] mfd: tc6393xb: Use gpiochip data pointer Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> - 2016-03-31 12:20 +0200
  [PATCH 3/9] mfd: htc-egpio: Use gpiochip data pointer Linus Walleij <linus.walleij@linaro.org> - 2016-03-30 10:50 +0200
  [PATCH 8/9] mfd: ucb1x00: Use gpiochip data pointer Linus Walleij <linus.walleij@linaro.org> - 2016-03-30 10:50 +0200
  [PATCH 4/9] mfd: htc-i2cpld: Use gpiochip data pointer Linus Walleij <linus.walleij@linaro.org> - 2016-03-30 11:00 +0200
  [PATCH 7/9] mfd: tps65010: Use gpiochip data pointer Linus Walleij <linus.walleij@linaro.org> - 2016-03-30 11:00 +0200

csiph-web