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

Commit f633a512 authored by Andrew Lunn's avatar Andrew Lunn Committed by Jacek Anaszewski
Browse files

leds: wm831x: 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 avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarJacek Anaszewski <j.anaszewski@samsung.com>
parent 5029a2e3

drivers/leds/leds-wm831x-status.c

+9 −16
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
struct wm831x_status {

	struct led_classdev cdev;

	struct wm831x *wm831x;

	struct work_struct work;

	struct mutex mutex;



	spinlock_t value_lock;
@@ -40,10 +39,8 @@ struct wm831x_status { 
#define to_wm831x_status(led_cdev) \

	container_of(led_cdev, struct wm831x_status, cdev)



static void wm831x_status_work(struct work_struct *work)

static void wm831x_status_set(struct wm831x_status *led)

{

	struct wm831x_status *led = container_of(work, struct wm831x_status,

						 work);

	unsigned long flags;



	mutex_lock(&led->mutex);
@@ -70,7 +67,7 @@ static void wm831x_status_work(struct work_struct *work) 
	mutex_unlock(&led->mutex);

}



static void wm831x_status_set(struct led_classdev *led_cdev,

static int wm831x_status_brightness_set(struct led_classdev *led_cdev,

					 enum led_brightness value)

{

	struct wm831x_status *led = to_wm831x_status(led_cdev);
@@ -80,8 +77,10 @@ static void wm831x_status_set(struct led_classdev *led_cdev, 
	led->brightness = value;

	if (value == LED_OFF)

		led->blink = 0;

	schedule_work(&led->work);

	spin_unlock_irqrestore(&led->value_lock, flags);

	wm831x_status_set(led);



	return 0;

}



static int wm831x_status_blink_set(struct led_classdev *led_cdev,
@@ -147,11 +146,8 @@ static int wm831x_status_blink_set(struct led_classdev *led_cdev, 
	else

		led->blink = 0;



	/* Always update; if we fail turn off blinking since we expect

	 * a software fallback. */

	schedule_work(&led->work);



	spin_unlock_irqrestore(&led->value_lock, flags);

	wm831x_status_set(led);



	return ret;

}
@@ -206,11 +202,9 @@ static ssize_t wm831x_status_src_store(struct device *dev, 
	for (i = 0; i < ARRAY_SIZE(led_src_texts); i++) {

		if (!strcmp(name, led_src_texts[i])) {

			mutex_lock(&led->mutex);



			led->src = i;

			schedule_work(&led->work);



			mutex_unlock(&led->mutex);

			wm831x_status_set(led);

		}

	}
@@ -262,7 +256,6 @@ static int wm831x_status_probe(struct platform_device *pdev) 
		pdata.name = dev_name(&pdev->dev);



	mutex_init(&drvdata->mutex);

	INIT_WORK(&drvdata->work, wm831x_status_work);

	spin_lock_init(&drvdata->value_lock);



	/* We cache the configuration register and read startup values
@@ -287,7 +280,7 @@ static int wm831x_status_probe(struct platform_device *pdev) 


	drvdata->cdev.name = pdata.name;

	drvdata->cdev.default_trigger = pdata.default_trigger;

	drvdata->cdev.brightness_set = wm831x_status_set;

	drvdata->cdev.brightness_set_blocking = wm831x_status_brightness_set;

	drvdata->cdev.blink_set = wm831x_status_blink_set;

	drvdata->cdev.groups = wm831x_status_groups;