Merge branch 'for-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds

Pull LED subsystem update from Bryan Wu.

* 'for-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds: (50 commits)
  leds-lp8788: forgotten unlock at lp8788_led_work
  LEDS: propagate error codes in blinkm_detect()
  LEDS: memory leak in blinkm_led_common_set()
  leds: add new lp8788 led driver
  LEDS: add BlinkM RGB LED driver, documentation and update MAINTAINERS
  leds: max8997: Simplify max8997_led_set_mode implementation
  leds/leds-s3c24xx: use devm_gpio_request
  leds: convert Network Space v2 LED driver to devm_kzalloc() and cleanup error exit path
  leds: convert DAC124S085 LED driver to devm_kzalloc()
  leds: convert LM3530 LED driver to devm_kzalloc() and cleanup error exit path
  leds: convert TCA6507 LED driver to devm_kzalloc()
  leds: convert Freescale MC13783 LED driver to devm_kzalloc() and cleanup error exit path
  leds: convert ADP5520 LED driver to devm_kzalloc() and cleanup error exit path
  leds: convert PCA955x LED driver to devm_kzalloc() and cleanup error exit path
  leds: convert Sun Fire LED driver to devm_kzalloc() and cleanup error exit path
  leds: convert PCA9532 LED driver to devm_kzalloc()
  leds: convert LT3593 LED driver to devm_kzalloc()
  leds: convert Renesas TPU LED driver to devm_kzalloc() and cleanup error exit path
  leds: convert LP5523 LED driver to devm_kzalloc() and cleanup error exit path
  leds: convert PCA9633 LED driver to devm_kzalloc()
  ...

1 files changed, 23 insertions, 21 deletions

diff --git a/drivers/leds/leds-s3c24xx.c b/drivers/leds/leds-s3c24xx.c
index bd0a5ed49c42..942f0ea18178 100644
--- a/drivers/leds/leds-s3c24xx.c
+++ b/drivers/leds/leds-s3c24xx.c
@@ -45,17 +45,19 @@ static void s3c24xx_led_set(struct led_classdev *led_cdev,
 {
         struct s3c24xx_gpio_led *led = to_gpio(led_cdev);
         struct s3c24xx_led_platdata *pd = led->pdata;
+        int state = (value ? 1 : 0) ^ (pd->flags & S3C24XX_LEDF_ACTLOW);
 
         /* there will be a short delay between setting the output and
          * going from output to input when using tristate. */
 
-        s3c2410_gpio_setpin(pd->gpio, (value ? 1 : 0) ^
-                            (pd->flags & S3C24XX_LEDF_ACTLOW));
-
-        if (pd->flags & S3C24XX_LEDF_TRISTATE)
-                s3c2410_gpio_cfgpin(pd->gpio,
-                        value ? S3C2410_GPIO_OUTPUT : S3C2410_GPIO_INPUT);
+        gpio_set_value(pd->gpio, state);
 
+        if (pd->flags & S3C24XX_LEDF_TRISTATE) {
+                if (value)
+                        gpio_direction_output(pd->gpio, state);
+                else
+                        gpio_direction_input(pd->gpio);
+        }
 }
 
 static int s3c24xx_led_remove(struct platform_device *dev)
@@ -63,7 +65,6 @@ static int s3c24xx_led_remove(struct platform_device *dev)
         struct s3c24xx_gpio_led *led = pdev_to_gpio(dev);
 
         led_classdev_unregister(&led->cdev);
-        kfree(led);
 
         return 0;
 }
@@ -74,7 +75,8 @@ static int s3c24xx_led_probe(struct platform_device *dev)
         struct s3c24xx_gpio_led *led;
         int ret;
 
-        led = kzalloc(sizeof(struct s3c24xx_gpio_led), GFP_KERNEL);
+        led = devm_kzalloc(&dev->dev, sizeof(struct s3c24xx_gpio_led),
+                           GFP_KERNEL);
         if (led == NULL) {
                 dev_err(&dev->dev, "No memory for device\n");
                 return -ENOMEM;
@@ -89,27 +91,27 @@ static int s3c24xx_led_probe(struct platform_device *dev)
 
         led->pdata = pdata;
 
+        ret = devm_gpio_request(&dev->dev, pdata->gpio, "S3C24XX_LED");
+        if (ret < 0)
+                return ret;
+
         /* no point in having a pull-up if we are always driving */
 
-        if (pdata->flags & S3C24XX_LEDF_TRISTATE) {
-                s3c2410_gpio_setpin(pdata->gpio, 0);
-                s3c2410_gpio_cfgpin(pdata->gpio, S3C2410_GPIO_INPUT);
-        } else {
-                s3c2410_gpio_pullup(pdata->gpio, 0);
-                s3c2410_gpio_setpin(pdata->gpio, 0);
-                s3c2410_gpio_cfgpin(pdata->gpio, S3C2410_GPIO_OUTPUT);
-        }
+        s3c_gpio_setpull(pdata->gpio, S3C_GPIO_PULL_NONE);
+
+        if (pdata->flags & S3C24XX_LEDF_TRISTATE)
+                gpio_direction_input(pdata->gpio);
+        else
+                gpio_direction_output(pdata->gpio,
+                        pdata->flags & S3C24XX_LEDF_ACTLOW ? 1 : 0);
 
         /* register our new led device */
 
         ret = led_classdev_register(&dev->dev, &led->cdev);
-        if (ret < 0) {
+        if (ret < 0)
                 dev_err(&dev->dev, "led_classdev_register failed\n");
-                kfree(led);
-                return ret;
-        }
 
-        return 0;
+        return ret;
 }
 
 static struct platform_driver s3c24xx_led_driver = {