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

Commit bc2c0dd8 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Jacek Anaszewski
Browse files

leds: gpio: switch to managed version of led_classdev_register 



Using the managed version of led_classdev_register allows to
significantly simplify the code.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarJacek Anaszewski <j.anaszewski@samsung.com>
parent bec69de8

drivers/leds/leds-gpio.c

+2 −21
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static int create_gpio_led(const struct gpio_led *template, 
	if (ret < 0)

		return ret;



	return led_classdev_register(parent, &led_dat->cdev);

	return devm_led_classdev_register(parent, &led_dat->cdev);

}



struct gpio_leds_priv {
@@ -219,8 +219,6 @@ static struct gpio_leds_priv *gpio_leds_create(struct platform_device *pdev) 
	return priv;



err:

	for (count = priv->num_leds - 1; count >= 0; count--)

		led_classdev_unregister(&priv->leds[count].cdev);

	return ERR_PTR(ret);

}
@@ -249,14 +247,9 @@ static int gpio_led_probe(struct platform_device *pdev) 
			ret = create_gpio_led(&pdata->leds[i],

					      &priv->leds[i],

					      &pdev->dev, pdata->gpio_blink_set);

			if (ret < 0) {

				/* On failure: unwind the led creations */

				for (i = i - 1; i >= 0; i--)

					led_classdev_unregister(

							&priv->leds[i].cdev);

			if (ret < 0)

				return ret;

		}

		}

	} else {

		priv = gpio_leds_create(pdev);

		if (IS_ERR(priv))
@@ -268,17 +261,6 @@ static int gpio_led_probe(struct platform_device *pdev) 
	return 0;

}



static int gpio_led_remove(struct platform_device *pdev)

{

	struct gpio_leds_priv *priv = platform_get_drvdata(pdev);

	int i;



	for (i = 0; i < priv->num_leds; i++)

		led_classdev_unregister(&priv->leds[i].cdev);



	return 0;

}



static void gpio_led_shutdown(struct platform_device *pdev)

{

	struct gpio_leds_priv *priv = platform_get_drvdata(pdev);
@@ -293,7 +275,6 @@ static void gpio_led_shutdown(struct platform_device *pdev) 


static struct platform_driver gpio_led_driver = {

	.probe		= gpio_led_probe,

	.remove		= gpio_led_remove,

	.shutdown	= gpio_led_shutdown,

	.driver		= {

		.name	= "leds-gpio",