From: Linus Walleij <linus.walleij@linaro.org>
Date: Tue, 22 Apr 2014 12:38:21 +0000 (+0200)
Subject: gpiolib: of: remove gpio_to_desc() usage
X-Git-Tag: v3.16-rc1~30^2~53^2~69
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ccd9726e05f0b181016db1adcff633cf9baf5c4e;p=~emulex%2Finfiniband.git

gpiolib: of: remove gpio_to_desc() usage

As demonstrated by commit
390d82e312c56b75407a3606cbcde8c4bc7f10ae
"gpiolib: ACPI: remove gpio_to_desc() usage"

gpio_to_desc() must die. Replace one of its usage by the
newly-introduced gpiochip_get_desc() function.

Reviewed-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---

diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
index 2024d45e550..db98d3a12f7 100644
--- a/drivers/gpio/gpiolib-of.c
+++ b/drivers/gpio/gpiolib-of.c
@@ -48,7 +48,7 @@ static int of_gpiochip_find_and_xlate(struct gpio_chip *gc, void *data)
 	if (ret < 0)
 		return false;
 
-	gg_data->out_gpio = gpio_to_desc(ret + gc->base);
+	gg_data->out_gpio = gpiochip_get_desc(gc, ret);
 	return true;
 }