Skip to contentSkip to conversation

leds: wm831x-status: use devm_led_classdev_register()

PATCH In review Yang Yingliang 1 participant 2 messages Jun 5, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 leds: wm831x-status: use devm_led_classdev_register()

Use devm_led_classdev_register() for led device registration and get rid of .remove callback to remove led device. This is done by managed device framework.

---
 drivers/leds/leds-wm831x-status.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)
drivers/leds/leds-wm831x-status.c +1 -11
index c48b80574f02..8ccd8b472572 100644
@@ -269,7 +269,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;
@@ -280,21 +280,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);
Signature · 1 line
2.25.1
#1 lore raw

This patch is wrong, ignore it.

Quoted 44 lines · Yang Yingliang

Use devm_led_classdev_register() for led device registration and get rid of .remove callback to remove led device. This is done by managed device framework.

---
  drivers/leds/leds-wm831x-status.c | 12 +-----------
  1 file changed, 1 insertion(+), 11 deletions(-)
drivers/leds/leds-wm831x-status.c +1 -11
index c48b80574f02..8ccd8b472572 100644
@@ -269,7 +269,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;
@@ -280,21 +280,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);