i2c: s3c2410: Convert to use GPIO descriptors

The S3C2410 does some funny dance around its pins:
- First try to call back to the platform to get and control
  some GPIO pins
- If this doesn't work, it tries to get a pin control handle
- If this doesn't work, it retrieves two GPIOs from the device
  tree node and does nothing with them

If we're gonna retrieve two GPIOs and do nothing with them, we
might as well do it using the GPIO descriptor API. When we use
the resource management API, the code gets smaller.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index 53bc021..ed06a85 100644 (file)
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -33,7 +33,7 @@
 #include <linux/slab.h>
 #include <linux/io.h>
 #include <linux/of.h>
-#include <linux/of_gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/pinctrl/consumer.h>
 #include <linux/mfd/syscon.h>
 #include <linux/regmap.h>
@@ -122,7 +122,7 @@ struct s3c24xx_i2c {
        struct i2c_adapter      adap;
 
        struct s3c2410_platform_i2c     *pdata;
-       int                     gpios[2];
+       struct gpio_desc        *gpios[2];
        struct pinctrl          *pctrl;
 #if defined(CONFIG_ARM_S3C24XX_CPUFREQ)
        struct notifier_block   freq_transition;
@@ -956,53 +956,27 @@ static inline void s3c24xx_i2c_deregister_cpufreq(struct s3c24xx_i2c *i2c)
 #ifdef CONFIG_OF
 static int s3c24xx_i2c_parse_dt_gpio(struct s3c24xx_i2c *i2c)
 {
-       int idx, gpio, ret;
+       int i;
 
        if (i2c->quirks & QUIRK_NO_GPIO)
                return 0;
 
-       for (idx = 0; idx < 2; idx++) {
-               gpio = of_get_gpio(i2c->dev->of_node, idx);
-               if (!gpio_is_valid(gpio)) {
-                       dev_err(i2c->dev, "invalid gpio[%d]: %d\n", idx, gpio);
-                       goto free_gpio;
-               }
-               i2c->gpios[idx] = gpio;
-
-               ret = gpio_request(gpio, "i2c-bus");
-               if (ret) {
-                       dev_err(i2c->dev, "gpio [%d] request failed (%d)\n",
-                               gpio, ret);
-                       goto free_gpio;
+       for (i = 0; i < 2; i++) {
+               i2c->gpios[i] = devm_gpiod_get_index(i2c->dev, NULL,
+                                                    i, GPIOD_ASIS);
+               if (IS_ERR(i2c->gpios[i])) {
+                       dev_err(i2c->dev, "i2c gpio invalid at index %d\n", i);
+                       return -EINVAL;
                }
        }
        return 0;
-
-free_gpio:
-       while (--idx >= 0)
-               gpio_free(i2c->gpios[idx]);
-       return -EINVAL;
 }
 
-static void s3c24xx_i2c_dt_gpio_free(struct s3c24xx_i2c *i2c)
-{
-       unsigned int idx;
-
-       if (i2c->quirks & QUIRK_NO_GPIO)
-               return;
-
-       for (idx = 0; idx < 2; idx++)
-               gpio_free(i2c->gpios[idx]);
-}
 #else
 static int s3c24xx_i2c_parse_dt_gpio(struct s3c24xx_i2c *i2c)
 {
        return 0;
 }
-
-static void s3c24xx_i2c_dt_gpio_free(struct s3c24xx_i2c *i2c)
-{
-}
 #endif
 
 /*
@@ -1231,9 +1205,6 @@ static int s3c24xx_i2c_remove(struct platform_device *pdev)
 
        i2c_del_adapter(&i2c->adap);
 
-       if (pdev->dev.of_node && IS_ERR(i2c->pctrl))
-               s3c24xx_i2c_dt_gpio_free(i2c);
-
        return 0;
 }