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

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / leds / leds-da903x.c

diff --git a/drivers/leds/leds-da903x.c b/drivers/leds/leds-da903x.c
index d7671afa4d2e72e3a57b990cde4ca9dcc1d2a1d0..c263a21db8298d057ca1cf5b9b28196d0af8e864 100644 (file)
--- a/drivers/leds/leds-da903x.c
+++ b/drivers/leds/leds-da903x.c
@@ -91,7 +91,7 @@ static void da903x_led_set(struct led_classdev *led_cdev,
        schedule_work(&led->work);
 }
 
-static int __devinit da903x_led_probe(struct platform_device *pdev)
+static int da903x_led_probe(struct platform_device *pdev)
 {
        struct led_info *pdata = pdev->dev.platform_data;
        struct da903x_led *led;
@@ -136,7 +136,7 @@ static int __devinit da903x_led_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int __devexit da903x_led_remove(struct platform_device *pdev)
+static int da903x_led_remove(struct platform_device *pdev)
 {
        struct da903x_led *led = platform_get_drvdata(pdev);
 
@@ -150,7 +150,7 @@ static struct platform_driver da903x_led_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = da903x_led_probe,
-       .remove         = __devexit_p(da903x_led_remove),
+       .remove         = da903x_led_remove,
 };
 
 module_platform_driver(da903x_led_driver);