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

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

leds: wm8350: 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>
Signed-off-by: default avatarJacek Anaszewski <j.anaszewski@samsung.com>
Acked-by: default avatarAntonio Ospite <ao2@ao2.it>
Reviewed-by: default avatarMark Brown <broonie@kernel.org>
parent 77e85036

drivers/leds/leds-wm8350.c

+25 −39
Original line number Diff line number Diff line
@@ -89,40 +89,42 @@ static const int isink_cur[] = { 
#define to_wm8350_led(led_cdev) \

	container_of(led_cdev, struct wm8350_led, cdev)



static void wm8350_led_enable(struct wm8350_led *led)

static int wm8350_led_enable(struct wm8350_led *led)

{

	int ret;

	int ret = 0;



	if (led->enabled)

		return;

		return ret;



	ret = regulator_enable(led->isink);

	if (ret != 0) {

		dev_err(led->cdev.dev, "Failed to enable ISINK: %d\n", ret);

		return;

		return ret;

	}



	ret = regulator_enable(led->dcdc);

	if (ret != 0) {

		dev_err(led->cdev.dev, "Failed to enable DCDC: %d\n", ret);

		regulator_disable(led->isink);

		return;

		return ret;

	}



	led->enabled = 1;



	return ret;

}



static void wm8350_led_disable(struct wm8350_led *led)

static int wm8350_led_disable(struct wm8350_led *led)

{

	int ret;

	int ret = 0;



	if (!led->enabled)

		return;

		return ret;



	ret = regulator_disable(led->dcdc);

	if (ret != 0) {

		dev_err(led->cdev.dev, "Failed to disable DCDC: %d\n", ret);

		return;

		return ret;

	}



	ret = regulator_disable(led->isink);
@@ -132,27 +134,29 @@ static void wm8350_led_disable(struct wm8350_led *led) 
		if (ret != 0)

			dev_err(led->cdev.dev, "Failed to reenable DCDC: %d\n",

				ret);

		return;

		return ret;

	}



	led->enabled = 0;



	return ret;

}



static void led_work(struct work_struct *work)

static int wm8350_led_set(struct led_classdev *led_cdev,

			   enum led_brightness value)

{

	struct wm8350_led *led = container_of(work, struct wm8350_led, work);

	struct wm8350_led *led = to_wm8350_led(led_cdev);

	unsigned long flags;

	int ret;

	int uA;

	unsigned long flags;



	mutex_lock(&led->mutex);

	led->value = value;



	spin_lock_irqsave(&led->value_lock, flags);



	if (led->value == LED_OFF) {

		spin_unlock_irqrestore(&led->value_lock, flags);

		wm8350_led_disable(led);

		goto out;

		return wm8350_led_disable(led);

	}



	/* This scales linearly into the index of valid current
@@ -166,36 +170,21 @@ static void led_work(struct work_struct *work) 


	ret = regulator_set_current_limit(led->isink, isink_cur[uA],

					  isink_cur[uA]);

	if (ret != 0)

	if (ret != 0) {

		dev_err(led->cdev.dev, "Failed to set %duA: %d\n",

			isink_cur[uA], ret);



	wm8350_led_enable(led);



out:

	mutex_unlock(&led->mutex);

		return ret;

	}



static void wm8350_led_set(struct led_classdev *led_cdev,

			   enum led_brightness value)

{

	struct wm8350_led *led = to_wm8350_led(led_cdev);

	unsigned long flags;



	spin_lock_irqsave(&led->value_lock, flags);

	led->value = value;

	schedule_work(&led->work);

	spin_unlock_irqrestore(&led->value_lock, flags);

	return wm8350_led_enable(led);

}



static void wm8350_led_shutdown(struct platform_device *pdev)

{

	struct wm8350_led *led = platform_get_drvdata(pdev);



	mutex_lock(&led->mutex);

	led->value = LED_OFF;

	wm8350_led_disable(led);

	mutex_unlock(&led->mutex);

}



static int wm8350_led_probe(struct platform_device *pdev)
@@ -232,7 +221,7 @@ static int wm8350_led_probe(struct platform_device *pdev) 
	if (led == NULL)

		return -ENOMEM;



	led->cdev.brightness_set = wm8350_led_set;

	led->cdev.brightness_set_blocking = wm8350_led_set;

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

	led->cdev.name = pdata->name;

	led->cdev.flags |= LED_CORE_SUSPENDRESUME;
@@ -251,8 +240,6 @@ static int wm8350_led_probe(struct platform_device *pdev) 
			 pdata->max_uA);



	spin_lock_init(&led->value_lock);

	mutex_init(&led->mutex);

	INIT_WORK(&led->work, led_work);

	led->value = LED_OFF;

	platform_set_drvdata(pdev, led);
@@ -264,7 +251,6 @@ static int wm8350_led_remove(struct platform_device *pdev) 
	struct wm8350_led *led = platform_get_drvdata(pdev);



	led_classdev_unregister(&led->cdev);

	flush_work(&led->work);

	wm8350_led_disable(led);

	return 0;

}

include/linux/mfd/wm8350/pmic.h

+0 −1
Original line number Diff line number Diff line
@@ -715,7 +715,6 @@ struct wm8350_led_platform_data { 


struct wm8350_led {

	struct platform_device *pdev;

	struct mutex mutex;

	struct work_struct work;

	spinlock_t value_lock;

	enum led_brightness value;