Browse Source

gpio: da9052: use gpiochip data pointer

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: Ashish Jangam <ashish.jangam@kpitcummins.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Linus Walleij 9 years ago
parent
commit
0f6082d2b8
1 changed files with 6 additions and 11 deletions
  1. 6 11
      drivers/gpio/gpio-da9052.c

+ 6 - 11
drivers/gpio/gpio-da9052.c

@@ -51,11 +51,6 @@ struct da9052_gpio {
 	struct gpio_chip gp;
 	struct gpio_chip gp;
 };
 };
 
 
-static inline struct da9052_gpio *to_da9052_gpio(struct gpio_chip *chip)
-{
-	return container_of(chip, struct da9052_gpio, gp);
-}
-
 static unsigned char da9052_gpio_port_odd(unsigned offset)
 static unsigned char da9052_gpio_port_odd(unsigned offset)
 {
 {
 	return offset % 2;
 	return offset % 2;
@@ -63,7 +58,7 @@ static unsigned char da9052_gpio_port_odd(unsigned offset)
 
 
 static int da9052_gpio_get(struct gpio_chip *gc, unsigned offset)
 static int da9052_gpio_get(struct gpio_chip *gc, unsigned offset)
 {
 {
-	struct da9052_gpio *gpio = to_da9052_gpio(gc);
+	struct da9052_gpio *gpio = gpiochip_get_data(gc);
 	int da9052_port_direction = 0;
 	int da9052_port_direction = 0;
 	int ret;
 	int ret;
 
 
@@ -102,7 +97,7 @@ static int da9052_gpio_get(struct gpio_chip *gc, unsigned offset)
 
 
 static void da9052_gpio_set(struct gpio_chip *gc, unsigned offset, int value)
 static void da9052_gpio_set(struct gpio_chip *gc, unsigned offset, int value)
 {
 {
-	struct da9052_gpio *gpio = to_da9052_gpio(gc);
+	struct da9052_gpio *gpio = gpiochip_get_data(gc);
 	int ret;
 	int ret;
 
 
 	if (da9052_gpio_port_odd(offset)) {
 	if (da9052_gpio_port_odd(offset)) {
@@ -128,7 +123,7 @@ static void da9052_gpio_set(struct gpio_chip *gc, unsigned offset, int value)
 
 
 static int da9052_gpio_direction_input(struct gpio_chip *gc, unsigned offset)
 static int da9052_gpio_direction_input(struct gpio_chip *gc, unsigned offset)
 {
 {
-	struct da9052_gpio *gpio = to_da9052_gpio(gc);
+	struct da9052_gpio *gpio = gpiochip_get_data(gc);
 	unsigned char register_value;
 	unsigned char register_value;
 	int ret;
 	int ret;
 
 
@@ -154,7 +149,7 @@ static int da9052_gpio_direction_input(struct gpio_chip *gc, unsigned offset)
 static int da9052_gpio_direction_output(struct gpio_chip *gc,
 static int da9052_gpio_direction_output(struct gpio_chip *gc,
 					unsigned offset, int value)
 					unsigned offset, int value)
 {
 {
-	struct da9052_gpio *gpio = to_da9052_gpio(gc);
+	struct da9052_gpio *gpio = gpiochip_get_data(gc);
 	unsigned char register_value;
 	unsigned char register_value;
 	int ret;
 	int ret;
 
 
@@ -179,7 +174,7 @@ static int da9052_gpio_direction_output(struct gpio_chip *gc,
 
 
 static int da9052_gpio_to_irq(struct gpio_chip *gc, u32 offset)
 static int da9052_gpio_to_irq(struct gpio_chip *gc, u32 offset)
 {
 {
-	struct da9052_gpio *gpio = to_da9052_gpio(gc);
+	struct da9052_gpio *gpio = gpiochip_get_data(gc);
 	struct da9052 *da9052 = gpio->da9052;
 	struct da9052 *da9052 = gpio->da9052;
 
 
 	int irq;
 	int irq;
@@ -219,7 +214,7 @@ static int da9052_gpio_probe(struct platform_device *pdev)
 	if (pdata && pdata->gpio_base)
 	if (pdata && pdata->gpio_base)
 		gpio->gp.base = pdata->gpio_base;
 		gpio->gp.base = pdata->gpio_base;
 
 
-	ret = gpiochip_add(&gpio->gp);
+	ret = gpiochip_add_data(&gpio->gp, gpio);
 	if (ret < 0) {
 	if (ret < 0) {
 		dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);
 		dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);
 		return ret;
 		return ret;