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-adp5520.c

diff --git a/drivers/leds/leds-adp5520.c b/drivers/leds/leds-adp5520.c
index ed15e6e..e8072ab 100644 (file)
--- a/drivers/leds/leds-adp5520.c
+++ b/drivers/leds/leds-adp5520.c
@@ -85,7 +85,7 @@ static int adp5520_led_setup(struct adp5520_led *led)
        return ret;
 }
 
-static int __devinit adp5520_led_prepare(struct platform_device *pdev)
+static int adp5520_led_prepare(struct platform_device *pdev)
 {
        struct adp5520_leds_platform_data *pdata = pdev->dev.platform_data;
        struct device *dev = pdev->dev.parent;
@@ -101,7 +101,7 @@ static int __devinit adp5520_led_prepare(struct platform_device *pdev)
        return ret;
 }
 
-static int __devinit adp5520_led_probe(struct platform_device *pdev)
+static int adp5520_led_probe(struct platform_device *pdev)
 {
        struct adp5520_leds_platform_data *pdata = pdev->dev.platform_data;
        struct adp5520_led *led, *led_dat;
@@ -183,7 +183,7 @@ err:
        return ret;
 }
 
-static int __devexit adp5520_led_remove(struct platform_device *pdev)
+static int adp5520_led_remove(struct platform_device *pdev)
 {
        struct adp5520_leds_platform_data *pdata = pdev->dev.platform_data;
        struct adp5520_led *led;
@@ -208,7 +208,7 @@ static struct platform_driver adp5520_led_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = adp5520_led_probe,
-       .remove         = __devexit_p(adp5520_led_remove),
+       .remove         = adp5520_led_remove,
 };
 
 module_platform_driver(adp5520_led_driver);