Merge branch 'for-4.6/drivers' of git://git.kernel.dk/linux-block

[cascardo/linux.git] / drivers / leds / leds-da903x.c

diff --git a/drivers/leds/leds-da903x.c b/drivers/leds/leds-da903x.c
index 4752a2b..5ff7d72 100644 (file)
--- a/drivers/leds/leds-da903x.c
+++ b/drivers/leds/leds-da903x.c
@@ -113,21 +113,12 @@ static int da903x_led_probe(struct platform_device *pdev)
        led->flags = pdata->flags;
        led->master = pdev->dev.parent;
 
-       ret = led_classdev_register(led->master, &led->cdev);
+       ret = devm_led_classdev_register(led->master, &led->cdev);
        if (ret) {
                dev_err(&pdev->dev, "failed to register LED %d\n", id);
                return ret;
        }
 
-       platform_set_drvdata(pdev, led);
-       return 0;
-}
-
-static int da903x_led_remove(struct platform_device *pdev)
-{
-       struct da903x_led *led = platform_get_drvdata(pdev);
-
-       led_classdev_unregister(&led->cdev);
        return 0;
 }
 
@@ -136,7 +127,6 @@ static struct platform_driver da903x_led_driver = {
                .name   = "da903x-led",
        },
        .probe          = da903x_led_probe,
-       .remove         = da903x_led_remove,
 };
 
 module_platform_driver(da903x_led_driver);