Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / drivers / leds / leds-cobalt-qube.c

diff --git a/drivers/leds/leds-cobalt-qube.c b/drivers/leds/leds-cobalt-qube.c
index 6a8725cc7b4dfe119a2083e37e1290198bdbdd24..ffa99303b629143877a09ce0d4ba828967a72f0f 100644 (file)
--- a/drivers/leds/leds-cobalt-qube.c
+++ b/drivers/leds/leds-cobalt-qube.c
@@ -34,7 +34,7 @@ static struct led_classdev qube_front_led = {
        .default_trigger        = "default-on",
 };
 
-static int __devinit cobalt_qube_led_probe(struct platform_device *pdev)
+static int cobalt_qube_led_probe(struct platform_device *pdev)
 {
        struct resource *res;
        int retval;
@@ -63,7 +63,7 @@ err_iounmap:
        return retval;
 }
 
-static int __devexit cobalt_qube_led_remove(struct platform_device *pdev)
+static int cobalt_qube_led_remove(struct platform_device *pdev)
 {
        led_classdev_unregister(&qube_front_led);
 
@@ -77,7 +77,7 @@ static int __devexit cobalt_qube_led_remove(struct platform_device *pdev)
 
 static struct platform_driver cobalt_qube_led_driver = {
        .probe  = cobalt_qube_led_probe,
-       .remove = __devexit_p(cobalt_qube_led_remove),
+       .remove = cobalt_qube_led_remove,
        .driver = {
                .name   = "cobalt-qube-leds",
                .owner  = THIS_MODULE,