Skip to contentSkip to conversation

leds: leds-wrap.c: Use devm_led_classdev_register

PATCH In review Fida Mohammad 2 participants 2 messages Oct 21, 2015 – Oct 22, 2015 LED

lore
Share & tools
lore

Fida Mohammad

author
#0 lore raw

PATCH 1/1 leds: leds-wrap.c: Use devm_led_classdev_register

Use of resource managed function devm_led_classdev_register to make initialization path simpler. Also removed redundant remove function.

Signed-off-by Fida Mohammad <[email protected]>
---
 drivers/leds/leds-wrap.c | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)
drivers/leds/leds-wrap.c +4 -22
index 1ba3def..c5ff4b4 100644
@@ -76,39 +76,21 @@ static int wrap_led_probe(struct platform_device *pdev)
 {
 	int ret;
 
-	ret = led_classdev_register(&pdev->dev, &wrap_power_led);
+	ret = devm_led_classdev_register(&pdev->dev, &wrap_power_led);
 	if (ret < 0)
 		return ret;
 
-	ret = led_classdev_register(&pdev->dev, &wrap_error_led);
+	ret = devm_led_classdev_register(&pdev->dev, &wrap_error_led);
 	if (ret < 0)
-		goto err1;
-
-	ret = led_classdev_register(&pdev->dev, &wrap_extra_led);
-	if (ret < 0)
-		goto err2;
-
-	return ret;
+		return ret;
 
-err2:
-	led_classdev_unregister(&wrap_error_led);
-err1:
-	led_classdev_unregister(&wrap_power_led);
+	return  devm_led_classdev_register(&pdev->dev, &wrap_extra_led);
 
-	return ret;
 }
 
-static int wrap_led_remove(struct platform_device *pdev)
-{
-	led_classdev_unregister(&wrap_power_led);
-	led_classdev_unregister(&wrap_error_led);
-	led_classdev_unregister(&wrap_extra_led);
-	return 0;
-}
 
 static struct platform_driver wrap_led_driver = {
 	.probe		= wrap_led_probe,
-	.remove		= wrap_led_remove,
 	.driver		= {
 		.name		= DRVNAME,
 	},
Signature · 1 line
1.9.1
#1 lore raw

Hi Fida,

Quoted 30 lines · Fida Mohammad

Use of resource managed function devm_led_classdev_register to make initialization path simpler. Also removed redundant remove function.

Signed-off-by Fida Mohammad <[email protected]>
---
  drivers/leds/leds-wrap.c | 26 ++++----------------------
  1 file changed, 4 insertions(+), 22 deletions(-)
drivers/leds/leds-wrap.c +2 -7
index 1ba3def..c5ff4b4 100644
@@ -76,39 +76,21 @@ static int wrap_led_probe(struct platform_device *pdev)
  {
  	int ret;
 
-	ret = led_classdev_register(&pdev->dev, &wrap_power_led);
+	ret = devm_led_classdev_register(&pdev->dev, &wrap_power_led);
  	if (ret < 0)
  		return ret;
 
-	ret = led_classdev_register(&pdev->dev, &wrap_error_led);
+	ret = devm_led_classdev_register(&pdev->dev, &wrap_error_led);
  	if (ret < 0)
-		goto err1;
-
-	ret = led_classdev_register(&pdev->dev, &wrap_extra_led);
-	if (ret < 0)
-		goto err2;

drivers/leds/leds-wrap.c static int wrap_led_probe(struct platform_device *pdev) · line 88

Quoted 10 lines
drivers/leds/leds-wrap.c +2 -6
-
-	return ret;
+		return ret;
 
-err2:
-	led_classdev_unregister(&wrap_error_led);
-err1:
-	led_classdev_unregister(&wrap_power_led);
+	return  devm_led_classdev_register(&pdev->dev, &wrap_extra_led);

Removed two extra empty lines end applied, thanks.

Quoted 18 lines
drivers/leds/leds-wrap.c +0 -9
-	return ret;
  }
 
-static int wrap_led_remove(struct platform_device *pdev)
-{
-	led_classdev_unregister(&wrap_power_led);
-	led_classdev_unregister(&wrap_error_led);
-	led_classdev_unregister(&wrap_extra_led);
-	return 0;
-}
 
  static struct platform_driver wrap_led_driver = {
  	.probe		= wrap_led_probe,
-	.remove		= wrap_led_remove,
  	.driver		= {
  		.name		= DRVNAME,
  	},
Signature · 2 lines
Best Regards,
Jacek Anaszewski