]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
leds: wm831x-status: Use devm_led_classdev_register
authorAmitoj Kaur Chawla <amitoj1606@gmail.com>
Wed, 9 Mar 2016 03:23:47 +0000 (08:53 +0530)
committerJacek Anaszewski <j.anaszewski@samsung.com>
Mon, 14 Mar 2016 08:22:22 +0000 (09:22 +0100)
Switch to resource-managed function devm_led_classdev_register instead
of led_classdev_register and remove unneeded led_classdev_unregister.

Also, remove platform_set_drvdata from probe function and the remove
function, wm831x_status_remove as it is now has nothing to do.

The Coccinelle semantic patch used to make this change is as follows:
//<smpl>
@platform@
identifier p, probefn, removefn;
@@
struct platform_driver p = {
  .probe = probefn,
  .remove = removefn,
};

@prb@
identifier platform.probefn, pdev;
expression e;
@@
probefn(struct platform_device *pdev, ...) {
  ...
  e =
- led_classdev_register
+ devm_led_classdev_register
  (...);
   ...
?- led_classdev_unregister(...);
  ...
}
@remove depends on prb@
identifier platform.removefn;
@@
removefn(...) {
...
?- led_classdev_unregister(...);
...
}
//</smpl>

Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
drivers/leds/leds-wm831x-status.c

index 64a22263e7fc50fd5dca571a7ee2f78804b3e8ee..be93b20e792a7aa36dc81a0cb60de7bb8c66654d 100644 (file)
@@ -239,7 +239,6 @@ static int wm831x_status_probe(struct platform_device *pdev)
                               GFP_KERNEL);
        if (!drvdata)
                return -ENOMEM;
-       platform_set_drvdata(pdev, drvdata);
 
        drvdata->wm831x = wm831x;
        drvdata->reg = res->start;
@@ -284,7 +283,7 @@ static int wm831x_status_probe(struct platform_device *pdev)
        drvdata->cdev.blink_set = wm831x_status_blink_set;
        drvdata->cdev.groups = wm831x_status_groups;
 
-       ret = led_classdev_register(wm831x->dev, &drvdata->cdev);
+       ret = devm_led_classdev_register(wm831x->dev, &drvdata->cdev);
        if (ret < 0) {
                dev_err(&pdev->dev, "Failed to register LED: %d\n", ret);
                return ret;
@@ -293,21 +292,11 @@ static int wm831x_status_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int wm831x_status_remove(struct platform_device *pdev)
-{
-       struct wm831x_status *drvdata = platform_get_drvdata(pdev);
-
-       led_classdev_unregister(&drvdata->cdev);
-
-       return 0;
-}
-
 static struct platform_driver wm831x_status_driver = {
        .driver = {
                   .name = "wm831x-status",
                   },
        .probe = wm831x_status_probe,
-       .remove = wm831x_status_remove,
 };
 
 module_platform_driver(wm831x_status_driver);