Commit 7edc00d0 authored by Jacek Anaszewski's avatar Jacek Anaszewski
Browse files

leds: max77693: 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>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
parent 648da8ff

drivers/leds/leds-max77693.c

+9 −48
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <linux/platform_device.h>

#include <linux/regmap.h>

#include <linux/slab.h>

#include <linux/workqueue.h>

#include <media/v4l2-flash-led-class.h>



#define MODE_OFF		0
@@ -62,8 +61,6 @@ struct max77693_sub_led { 
	int fled_id;

	/* corresponding LED Flash class device */

	struct led_classdev_flash fled_cdev;

	/* assures led-triggers compatibility */

	struct work_struct work_brightness_set;

	/* V4L2 Flash device */

	struct v4l2_flash *v4l2_flash;
@@ -463,10 +460,14 @@ static int max77693_setup(struct max77693_led_device *led, 
	return max77693_set_mode_reg(led, MODE_OFF);

}



static int __max77693_led_brightness_set(struct max77693_led_device *led,

					int fled_id, enum led_brightness value)

/* LED subsystem callbacks */

static int max77693_led_brightness_set(struct led_classdev *led_cdev,

					enum led_brightness value)

{

	int ret;

	struct led_classdev_flash *fled_cdev = lcdev_to_flcdev(led_cdev);

	struct max77693_sub_led *sub_led = flcdev_to_sub_led(fled_cdev);

	struct max77693_led_device *led = sub_led_to_led(sub_led);

	int fled_id = sub_led->fled_id, ret;



	mutex_lock(&led->lock);
@@ -494,43 +495,8 @@ static int __max77693_led_brightness_set(struct max77693_led_device *led, 
			ret);

unlock:

	mutex_unlock(&led->lock);

	return ret;

}



static void max77693_led_brightness_set_work(

					struct work_struct *work)

{

	struct max77693_sub_led *sub_led =

			container_of(work, struct max77693_sub_led,

					work_brightness_set);

	struct max77693_led_device *led = sub_led_to_led(sub_led);



	__max77693_led_brightness_set(led, sub_led->fled_id,

				sub_led->torch_brightness);

}



/* LED subsystem callbacks */



static int max77693_led_brightness_set_sync(

				struct led_classdev *led_cdev,

				enum led_brightness value)

{

	struct led_classdev_flash *fled_cdev = lcdev_to_flcdev(led_cdev);

	struct max77693_sub_led *sub_led = flcdev_to_sub_led(fled_cdev);

	struct max77693_led_device *led = sub_led_to_led(sub_led);



	return __max77693_led_brightness_set(led, sub_led->fled_id, value);

}



static void max77693_led_brightness_set(

				struct led_classdev *led_cdev,

				enum led_brightness value)

{

	struct led_classdev_flash *fled_cdev = lcdev_to_flcdev(led_cdev);

	struct max77693_sub_led *sub_led = flcdev_to_sub_led(fled_cdev);



	sub_led->torch_brightness = value;

	schedule_work(&sub_led->work_brightness_set);

	return ret;

}



static int max77693_led_flash_brightness_set(
@@ -931,16 +897,13 @@ static void max77693_init_fled_cdev(struct max77693_sub_led *sub_led, 


	led_cdev->name = led_cfg->label[fled_id];



	led_cdev->brightness_set = max77693_led_brightness_set;

	led_cdev->brightness_set_blocking = max77693_led_brightness_set_sync;

	led_cdev->brightness_set_blocking = max77693_led_brightness_set;

	led_cdev->max_brightness = (led->iout_joint ?

					led_cfg->iout_torch_max[FLED1] +

					led_cfg->iout_torch_max[FLED2] :

					led_cfg->iout_torch_max[fled_id]) /

				   TORCH_IOUT_STEP;

	led_cdev->flags |= LED_DEV_CAP_FLASH;

	INIT_WORK(&sub_led->work_brightness_set,

			max77693_led_brightness_set_work);



	max77693_init_flash_settings(sub_led, led_cfg);
@@ -1062,13 +1025,11 @@ static int max77693_led_remove(struct platform_device *pdev) 
	if (led->iout_joint || max77693_fled_used(led, FLED1)) {

		v4l2_flash_release(sub_leds[FLED1].v4l2_flash);

		led_classdev_flash_unregister(&sub_leds[FLED1].fled_cdev);

		cancel_work_sync(&sub_leds[FLED1].work_brightness_set);

	}



	if (!led->iout_joint && max77693_fled_used(led, FLED2)) {

		v4l2_flash_release(sub_leds[FLED2].v4l2_flash);

		led_classdev_flash_unregister(&sub_leds[FLED2].fled_cdev);

		cancel_work_sync(&sub_leds[FLED2].work_brightness_set);

	}



	mutex_destroy(&led->lock);