1 files changed, 1 insertions, 18 deletions

diff --git a/drivers/leds/leds-s3c24xx.c b/drivers/leds/leds-s3c24xx.c
index 83641a7b299a..404da451cb88 100644
--- a/drivers/leds/leds-s3c24xx.c
+++ b/drivers/leds/leds-s3c24xx.c
@@ -29,11 +29,6 @@ struct s3c24xx_gpio_led {
         struct s3c24xx_led_platdata     *pdata;
 };
 
-static inline struct s3c24xx_gpio_led *pdev_to_gpio(struct platform_device *dev)
-{
-        return platform_get_drvdata(dev);
-}
-
 static inline struct s3c24xx_gpio_led *to_gpio(struct led_classdev *led_cdev)
 {
         return container_of(led_cdev, struct s3c24xx_gpio_led, cdev);
@@ -59,15 +54,6 @@ static void s3c24xx_led_set(struct led_classdev *led_cdev,
         }
 }
 
-static int s3c24xx_led_remove(struct platform_device *dev)
-{
-        struct s3c24xx_gpio_led *led = pdev_to_gpio(dev);
-
-        led_classdev_unregister(&led->cdev);
-
-        return 0;
-}
-
 static int s3c24xx_led_probe(struct platform_device *dev)
 {
         struct s3c24xx_led_platdata *pdata = dev_get_platdata(&dev->dev);
@@ -79,8 +65,6 @@ static int s3c24xx_led_probe(struct platform_device *dev)
         if (!led)
                 return -ENOMEM;
 
-        platform_set_drvdata(dev, led);
-
         led->cdev.brightness_set = s3c24xx_led_set;
         led->cdev.default_trigger = pdata->def_trigger;
         led->cdev.name = pdata->name;
@@ -104,7 +88,7 @@ static int s3c24xx_led_probe(struct platform_device *dev)
 
         /* register our new led device */
 
-        ret = led_classdev_register(&dev->dev, &led->cdev);
+        ret = devm_led_classdev_register(&dev->dev, &led->cdev);
         if (ret < 0)
                 dev_err(&dev->dev, "led_classdev_register failed\n");
 
@@ -113,7 +97,6 @@ static int s3c24xx_led_probe(struct platform_device *dev)
 
 static struct platform_driver s3c24xx_led_driver = {
         .probe          = s3c24xx_led_probe,
-        .remove         = s3c24xx_led_remove,
         .driver         = {
                 .name           = "s3c24xx_led",
         },