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

Groups > linux.kernel > #1367013

[PATCH 5/9] mfd: sm501: 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().

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(-)

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)
-- 
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