Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[~andy/linux] / drivers / leds / leds-asic3.c

diff --git a/drivers/leds/leds-asic3.c b/drivers/leds/leds-asic3.c
index 5de74ff90dcf3ffddb4ba22b5ed94976f59f9ffc..b474745e001b3a4332ac96e584824e189bd76b21 100644 (file)
--- a/drivers/leds/leds-asic3.c
+++ b/drivers/leds/leds-asic3.c
@@ -92,7 +92,7 @@ static int blink_set(struct led_classdev *cdev,
        return 0;
 }
 
-static int __devinit asic3_led_probe(struct platform_device *pdev)
+static int asic3_led_probe(struct platform_device *pdev)
 {
        struct asic3_led *led = pdev->dev.platform_data;
        int ret;
@@ -125,7 +125,7 @@ out:
        return ret;
 }
 
-static int __devexit asic3_led_remove(struct platform_device *pdev)
+static int asic3_led_remove(struct platform_device *pdev)
 {
        struct asic3_led *led = pdev->dev.platform_data;
 
@@ -167,7 +167,7 @@ static const struct dev_pm_ops asic3_led_pm_ops = {
 
 static struct platform_driver asic3_led_driver = {
        .probe          = asic3_led_probe,
-       .remove         = __devexit_p(asic3_led_remove),
+       .remove         = asic3_led_remove,
        .driver         = {
                .name   = "leds-asic3",
                .owner  = THIS_MODULE,