These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / leds / leds-fsg.c

diff --git a/kernel/drivers/leds/leds-fsg.c b/kernel/drivers/leds/leds-fsg.c
index 2b4dc73..257a813 100644 (file)
--- a/kernel/drivers/leds/leds-fsg.c
+++ b/kernel/drivers/leds/leds-fsg.c
@@ -156,63 +156,35 @@ static int fsg_led_probe(struct platform_device *pdev)
        latch_value = 0xffff;
        *latch_address = latch_value;
 
-       ret = led_classdev_register(&pdev->dev, &fsg_wlan_led);
+       ret = devm_led_classdev_register(&pdev->dev, &fsg_wlan_led);
        if (ret < 0)
-               goto failwlan;
+               return ret;
 
-       ret = led_classdev_register(&pdev->dev, &fsg_wan_led);
+       ret = devm_led_classdev_register(&pdev->dev, &fsg_wan_led);
        if (ret < 0)
-               goto failwan;
+               return ret;
 
-       ret = led_classdev_register(&pdev->dev, &fsg_sata_led);
+       ret = devm_led_classdev_register(&pdev->dev, &fsg_sata_led);
        if (ret < 0)
-               goto failsata;
+               return ret;
 
-       ret = led_classdev_register(&pdev->dev, &fsg_usb_led);
+       ret = devm_led_classdev_register(&pdev->dev, &fsg_usb_led);
        if (ret < 0)
-               goto failusb;
+               return ret;
 
-       ret = led_classdev_register(&pdev->dev, &fsg_sync_led);
+       ret = devm_led_classdev_register(&pdev->dev, &fsg_sync_led);
        if (ret < 0)
-               goto failsync;
+               return ret;
 
-       ret = led_classdev_register(&pdev->dev, &fsg_ring_led);
+       ret = devm_led_classdev_register(&pdev->dev, &fsg_ring_led);
        if (ret < 0)
-               goto failring;
-
-       return ret;
-
- failring:
-       led_classdev_unregister(&fsg_sync_led);
- failsync:
-       led_classdev_unregister(&fsg_usb_led);
- failusb:
-       led_classdev_unregister(&fsg_sata_led);
- failsata:
-       led_classdev_unregister(&fsg_wan_led);
- failwan:
-       led_classdev_unregister(&fsg_wlan_led);
- failwlan:
+               return ret;
 
        return ret;
 }
 
-static int fsg_led_remove(struct platform_device *pdev)
-{
-       led_classdev_unregister(&fsg_wlan_led);
-       led_classdev_unregister(&fsg_wan_led);
-       led_classdev_unregister(&fsg_sata_led);
-       led_classdev_unregister(&fsg_usb_led);
-       led_classdev_unregister(&fsg_sync_led);
-       led_classdev_unregister(&fsg_ring_led);
-
-       return 0;
-}
-
-
 static struct platform_driver fsg_led_driver = {
        .probe          = fsg_led_probe,
-       .remove         = fsg_led_remove,
        .driver         = {
                .name           = "fsg-led",
        },