Merge tag 'for-v3.8' of git://git.infradead.org/users/cbou/linux-pstore

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

diff --git a/drivers/leds/leds-netxbig.c b/drivers/leds/leds-netxbig.c
index b3c0377b51fbf7664822c4934b31dea4128ac36c..58a800b17dc706ecc9c75fff00aff68b7a74b534 100644 (file)
--- a/drivers/leds/leds-netxbig.c
+++ b/drivers/leds/leds-netxbig.c
@@ -71,7 +71,7 @@ static void gpio_ext_set_value(struct netxbig_gpio_ext *gpio_ext,
        spin_unlock_irqrestore(&gpio_ext_lock, flags);
 }
 
-static int __devinit gpio_ext_init(struct netxbig_gpio_ext *gpio_ext)
+static int gpio_ext_init(struct netxbig_gpio_ext *gpio_ext)
 {
        int err;
        int i;
@@ -301,7 +301,7 @@ static void delete_netxbig_led(struct netxbig_led_data *led_dat)
        led_classdev_unregister(&led_dat->cdev);
 }
 
-static int __devinit
+static int
 create_netxbig_led(struct platform_device *pdev,
                   struct netxbig_led_data *led_dat,
                   const struct netxbig_led *template)
@@ -352,7 +352,7 @@ create_netxbig_led(struct platform_device *pdev,
        return ret;
 }
 
-static int __devinit netxbig_led_probe(struct platform_device *pdev)
+static int netxbig_led_probe(struct platform_device *pdev)
 {
        struct netxbig_led_platform_data *pdata = pdev->dev.platform_data;
        struct netxbig_led_data *leds_data;
@@ -389,7 +389,7 @@ err_free_leds:
        return ret;
 }
 
-static int __devexit netxbig_led_remove(struct platform_device *pdev)
+static int netxbig_led_remove(struct platform_device *pdev)
 {
        struct netxbig_led_platform_data *pdata = pdev->dev.platform_data;
        struct netxbig_led_data *leds_data;