gpiolib: ACPI: remove gpio_to_desc() usage

Gnurou · linusw · commit 390d82e312c5 · 2014-02-12T17:15:46.000+01:00
gpio_to_desc() must die. Replace one of its usage by the
newly-introduced gpiochip_get_desc() function.

Signed-off-by: Alexandre Courbot &lt;acourbot@nvidia.com&gt;
Reviewed-by: Mika Westerberg &lt;mika.westerberg@linux.intel.com&gt;
Signed-off-by: Linus Walleij &lt;linus.walleij@linaro.org&gt;
diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c
@@ -60,7 +60,7 @@ static struct gpio_desc *acpi_get_gpiod(char *path, int pin)
 	if (pin < 0 || pin > chip->ngpio)
 		return ERR_PTR(-EINVAL);
 
-	return gpio_to_desc(chip->base + pin);
+	return gpiochip_get_desc(chip, pin);
 }
 
 static irqreturn_t acpi_gpio_irq_handler(int irq, void *data)

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ static struct gpio_desc acpi_get_gpiod(char path, int pin)`
`60`	`60`	`if (pin < 0 \|\| pin > chip->ngpio)`
`61`	`61`	`return ERR_PTR(-EINVAL);`
`62`	`62`
`63`		`- return gpio_to_desc(chip->base + pin);`
	`63`	`+ return gpiochip_get_desc(chip, pin);`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`static irqreturn_t acpi_gpio_irq_handler(int irq, void *data)`