Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48a7032b authored by Amitoj Kaur Chawla's avatar Amitoj Kaur Chawla Committed by Jacek Anaszewski
Browse files

leds: s3c24xx: Use devm_led_classdev_register 



Switch to resource-managed function devm_led_classdev_register instead
of led_classdev_register and remove unneeded led_classdev_unregister.

Also, remove unnecessary function pdev_to_gpio, platform_set_drvdata
in the probe function and the remove function, s3c24xx_led_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: default avatarAmitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: default avatarJacek Anaszewski <j.anaszewski@samsung.com>
parent 8d3b6a40

drivers/leds/leds-s3c24xx.c

+1 −18
Original line number Diff line number Diff line
@@ -29,11 +29,6 @@ struct s3c24xx_gpio_led { 
	struct s3c24xx_led_platdata	*pdata;

};



static inline struct s3c24xx_gpio_led *pdev_to_gpio(struct platform_device *dev)

{

	return platform_get_drvdata(dev);

}



static inline struct s3c24xx_gpio_led *to_gpio(struct led_classdev *led_cdev)

{

	return container_of(led_cdev, struct s3c24xx_gpio_led, cdev);
@@ -59,15 +54,6 @@ static void s3c24xx_led_set(struct led_classdev *led_cdev, 
	}

}



static int s3c24xx_led_remove(struct platform_device *dev)

{

	struct s3c24xx_gpio_led *led = pdev_to_gpio(dev);



	led_classdev_unregister(&led->cdev);



	return 0;

}



static int s3c24xx_led_probe(struct platform_device *dev)

{

	struct s3c24xx_led_platdata *pdata = dev_get_platdata(&dev->dev);
@@ -79,8 +65,6 @@ static int s3c24xx_led_probe(struct platform_device *dev) 
	if (!led)

		return -ENOMEM;



	platform_set_drvdata(dev, led);



	led->cdev.brightness_set = s3c24xx_led_set;

	led->cdev.default_trigger = pdata->def_trigger;

	led->cdev.name = pdata->name;
@@ -104,7 +88,7 @@ static int s3c24xx_led_probe(struct platform_device *dev) 


	/* register our new led device */



	ret = led_classdev_register(&dev->dev, &led->cdev);

	ret = devm_led_classdev_register(&dev->dev, &led->cdev);

	if (ret < 0)

		dev_err(&dev->dev, "led_classdev_register failed\n");
@@ -113,7 +97,6 @@ static int s3c24xx_led_probe(struct platform_device *dev) 


static struct platform_driver s3c24xx_led_driver = {

	.probe		= s3c24xx_led_probe,

	.remove		= s3c24xx_led_remove,

	.driver		= {

		.name		= "s3c24xx_led",

	},