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

diff --git a/drivers/leds/leds-rb532.c b/drivers/leds/leds-rb532.c
index f4a4851..2e746d2 100644 (file)
--- a/drivers/leds/leds-rb532.c
+++ b/drivers/leds/leds-rb532.c
@@ -37,12 +37,12 @@ static struct led_classdev rb532_uled = {
        .default_trigger = "nand-disk",
 };
 
-static int __devinit rb532_led_probe(struct platform_device *pdev)
+static int rb532_led_probe(struct platform_device *pdev)
 {
        return led_classdev_register(&pdev->dev, &rb532_uled);
 }
 
-static int __devexit rb532_led_remove(struct platform_device *pdev)
+static int rb532_led_remove(struct platform_device *pdev)
 {
        led_classdev_unregister(&rb532_uled);
        return 0;
@@ -50,7 +50,7 @@ static int __devexit rb532_led_remove(struct platform_device *pdev)
 
 static struct platform_driver rb532_led_driver = {
        .probe = rb532_led_probe,
-       .remove = __devexit_p(rb532_led_remove),
+       .remove = rb532_led_remove,
        .driver = {
                .name = "rb532-led",
                .owner = THIS_MODULE,