p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

leds: powernv: Implement brightness_set_blocking op 

Since brightness setting can sleep for this driver, implement
brightness_set_blocking op, instead of brightness_set.
It makes this driver compatible with LED triggers.

Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
Cc: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
This commit is contained in:
Jacek Anaszewski 2015-11-20 16:38:50 +01:00
parent ba1c8179c3
commit f5db6b8301
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/leds/leds-powernv.c
View File

@ -77,7 +77,7 @@ static int powernv_get_led_type(const char *led_type_desc)
* This function is called from work queue task context when ever it gets * This function is called from work queue task context when ever it gets
* scheduled. This function can sleep at opal_async_wait_response call. * scheduled. This function can sleep at opal_async_wait_response call.
*/ */
static void powernv_led_set(struct powernv_led_data *powernv_led, static int powernv_led_set(struct powernv_led_data *powernv_led,
enum led_brightness value) enum led_brightness value)
{ {
int rc, token; int rc, token;
@ -99,7 +99,7 @@ static void powernv_led_set(struct powernv_led_data *powernv_led,
if (token != -ERESTARTSYS) if (token != -ERESTARTSYS)
dev_err(dev, "%s: Couldn't get OPAL async token\n", dev_err(dev, "%s: Couldn't get OPAL async token\n",
__func__); __func__);
return; return token;
} }
rc = opal_leds_set_ind(token, powernv_led->loc_code, rc = opal_leds_set_ind(token, powernv_led->loc_code,
@ -125,6 +125,7 @@ static void powernv_led_set(struct powernv_led_data *powernv_led,
out_token: out_token:
opal_async_release_token(token); opal_async_release_token(token);
return rc;
} }
/* /*
@ -173,20 +174,23 @@ static enum led_brightness powernv_led_get(struct powernv_led_data *powernv_led)
* LED classdev 'brightness_get' function. This schedules work * LED classdev 'brightness_get' function. This schedules work
* to update LED state. * to update LED state.
*/ */
static void powernv_brightness_set(struct led_classdev *led_cdev, static int powernv_brightness_set(struct led_classdev *led_cdev,
enum led_brightness value) enum led_brightness value)
{ {
struct powernv_led_data *powernv_led = struct powernv_led_data *powernv_led =
container_of(led_cdev, struct powernv_led_data, cdev); container_of(led_cdev, struct powernv_led_data, cdev);
struct powernv_led_common *powernv_led_common = powernv_led->common; struct powernv_led_common *powernv_led_common = powernv_led->common;
int rc;
/* Do not modify LED in unload path */ /* Do not modify LED in unload path */
if (powernv_led_common->led_disabled) if (powernv_led_common->led_disabled)
return; return 0;
mutex_lock(&powernv_led_common->lock); mutex_lock(&powernv_led_common->lock);
powernv_led_set(powernv_led, value); rc = powernv_led_set(powernv_led, value);
mutex_unlock(&powernv_led_common->lock); mutex_unlock(&powernv_led_common->lock);
return rc;
} }
/* LED classdev 'brightness_get' function */ /* LED classdev 'brightness_get' function */
@ -227,7 +231,7 @@ static int powernv_led_create(struct device *dev,
return -ENOMEM; return -ENOMEM;
} }
powernv_led->cdev.brightness_set = powernv_brightness_set; powernv_led->cdev.brightness_set_blocking = powernv_brightness_set;
powernv_led->cdev.brightness_get = powernv_brightness_get; powernv_led->cdev.brightness_get = powernv_brightness_get;
powernv_led->cdev.brightness = LED_OFF; powernv_led->cdev.brightness = LED_OFF;
powernv_led->cdev.max_brightness = LED_FULL; powernv_led->cdev.max_brightness = LED_FULL;