Commit d5b8a090 authored by Jacek Anaszewski's avatar Jacek Anaszewski
Browse files

leds: gpio: Remove work queue 



Now the core implements the work queue, remove it from the drivers,
and switch to using brightness_set_blocking op.

Signed-off-by: default avatarJacek Anaszewski <j.anaszewski@samsung.com>
Cc: Raphael Assenat <raph@8d.com>
parent 0dd756f7

drivers/leds/leds-gpio.c

+22 −40
Original line number Diff line number Diff line
@@ -20,32 +20,16 @@ 
#include <linux/platform_device.h>

#include <linux/property.h>

#include <linux/slab.h>

#include <linux/workqueue.h>



struct gpio_led_data {

	struct led_classdev cdev;

	struct gpio_desc *gpiod;

	struct work_struct work;

	u8 new_level;

	u8 can_sleep;

	u8 blinking;

	int (*platform_gpio_blink_set)(struct gpio_desc *desc, int state,

			unsigned long *delay_on, unsigned long *delay_off);

};



static void gpio_led_work(struct work_struct *work)

{

	struct gpio_led_data *led_dat =

		container_of(work, struct gpio_led_data, work);



	if (led_dat->blinking) {

		led_dat->platform_gpio_blink_set(led_dat->gpiod,

					led_dat->new_level, NULL, NULL);

		led_dat->blinking = 0;

	} else

		gpiod_set_value_cansleep(led_dat->gpiod, led_dat->new_level);

}



static void gpio_led_set(struct led_classdev *led_cdev,

	enum led_brightness value)

{
@@ -58,23 +42,25 @@ static void gpio_led_set(struct led_classdev *led_cdev, 
	else

		level = 1;



	/* Setting GPIOs with I2C/etc requires a task context, and we don't

	 * seem to have a reliable way to know if we're already in one; so

	 * let's just assume the worst.

	 */

	if (led_dat->can_sleep) {

		led_dat->new_level = level;

		schedule_work(&led_dat->work);

	} else {

	if (led_dat->blinking) {

		led_dat->platform_gpio_blink_set(led_dat->gpiod, level,

						 NULL, NULL);

		led_dat->blinking = 0;

		} else

	} else {

		if (led_dat->can_sleep)

			gpiod_set_value_cansleep(led_dat->gpiod, level);

		else

			gpiod_set_value(led_dat->gpiod, level);

	}

}



static int gpio_led_set_blocking(struct led_classdev *led_cdev,

	enum led_brightness value)

{

	gpio_led_set(led_cdev, value);

	return 0;

}



static int gpio_blink_set(struct led_classdev *led_cdev,

	unsigned long *delay_on, unsigned long *delay_off)

{
@@ -125,12 +111,15 @@ static int create_gpio_led(const struct gpio_led *template, 
	led_dat->cdev.name = template->name;

	led_dat->cdev.default_trigger = template->default_trigger;

	led_dat->can_sleep = gpiod_cansleep(led_dat->gpiod);

	if (!led_dat->can_sleep)

		led_dat->cdev.brightness_set = gpio_led_set;

	else

		led_dat->cdev.brightness_set_blocking = gpio_led_set_blocking;

	led_dat->blinking = 0;

	if (blink_set) {

		led_dat->platform_gpio_blink_set = blink_set;

		led_dat->cdev.blink_set = gpio_blink_set;

	}

	led_dat->cdev.brightness_set = gpio_led_set;

	if (template->default_state == LEDS_GPIO_DEFSTATE_KEEP)

		state = !!gpiod_get_value_cansleep(led_dat->gpiod);

	else
@@ -143,17 +132,9 @@ static int create_gpio_led(const struct gpio_led *template, 
	if (ret < 0)

		return ret;



	INIT_WORK(&led_dat->work, gpio_led_work);



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

}



static void delete_gpio_led(struct gpio_led_data *led)

{

	led_classdev_unregister(&led->cdev);

	cancel_work_sync(&led->work);

}



struct gpio_leds_priv {

	int num_leds;

	struct gpio_led_data leds[];
@@ -233,7 +214,7 @@ static struct gpio_leds_priv *gpio_leds_create(struct platform_device *pdev) 


err:

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

		delete_gpio_led(&priv->leds[count]);

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

	return ERR_PTR(ret);

}
@@ -265,7 +246,8 @@ static int gpio_led_probe(struct platform_device *pdev) 
			if (ret < 0) {

				/* On failure: unwind the led creations */

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

					delete_gpio_led(&priv->leds[i]);

					led_classdev_unregister(

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

				return ret;

			}

		}
@@ -286,7 +268,7 @@ static int gpio_led_remove(struct platform_device *pdev) 
	int i;



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

		delete_gpio_led(&priv->leds[i]);

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



	return 0;

}