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

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / leds / leds-lt3593.c

diff --git a/drivers/leds/leds-lt3593.c b/drivers/leds/leds-lt3593.c
index f415c20..c9b9e1f 100644 (file)
--- a/drivers/leds/leds-lt3593.c
+++ b/drivers/leds/leds-lt3593.c
@@ -82,7 +82,7 @@ static void lt3593_led_set(struct led_classdev *led_cdev,
        schedule_work(&led_dat->work);
 }
 
-static int __devinit create_lt3593_led(const struct gpio_led *template,
+static int create_lt3593_led(const struct gpio_led *template,
        struct lt3593_led_data *led_dat, struct device *parent)
 {
        int ret, state;
@@ -132,7 +132,7 @@ static void delete_lt3593_led(struct lt3593_led_data *led)
        cancel_work_sync(&led->work);
 }
 
-static int __devinit lt3593_led_probe(struct platform_device *pdev)
+static int lt3593_led_probe(struct platform_device *pdev)
 {
        struct gpio_led_platform_data *pdata = pdev->dev.platform_data;
        struct lt3593_led_data *leds_data;
@@ -165,7 +165,7 @@ err:
        return ret;
 }
 
-static int __devexit lt3593_led_remove(struct platform_device *pdev)
+static int lt3593_led_remove(struct platform_device *pdev)
 {
        int i;
        struct gpio_led_platform_data *pdata = pdev->dev.platform_data;
@@ -181,7 +181,7 @@ static int __devexit lt3593_led_remove(struct platform_device *pdev)
 
 static struct platform_driver lt3593_led_driver = {
        .probe          = lt3593_led_probe,
-       .remove         = __devexit_p(lt3593_led_remove),
+       .remove         = lt3593_led_remove,
        .driver         = {
                .name   = "leds-lt3593",
                .owner  = THIS_MODULE,