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

Commit 2282e125 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Jacek Anaszewski
Browse files

leds: triggers: let struct led_trigger::activate() return an error code 



Given that activating a trigger can fail, let the callback return an
indication. This prevents to have a trigger active according to the
"trigger" sysfs attribute but not functional.

All users are changed accordingly to return 0 for now. There is no intended
change in behaviour.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarJacek Anaszewski <jacek.anaszewski@gmail.com>
parent 033692eb

drivers/leds/led-triggers.c

+21 −3
Original line number Diff line number Diff line
@@ -103,15 +103,16 @@ ssize_t led_trigger_show(struct device *dev, struct device_attribute *attr, 
EXPORT_SYMBOL_GPL(led_trigger_show);



/* Caller must ensure led_cdev->trigger_lock held */

void led_trigger_set(struct led_classdev *led_cdev, struct led_trigger *trig)

int led_trigger_set(struct led_classdev *led_cdev, struct led_trigger *trig)

{

	unsigned long flags;

	char *event = NULL;

	char *envp[2];

	const char *name;

	int ret;



	if (!led_cdev->trigger && !trig)

		return;

		return 0;



	name = trig ? trig->name : "none";

	event = kasprintf(GFP_KERNEL, "TRIGGER=%s", name);
@@ -134,8 +135,14 @@ void led_trigger_set(struct led_classdev *led_cdev, struct led_trigger *trig) 
		list_add_tail(&led_cdev->trig_list, &trig->led_cdevs);

		write_unlock_irqrestore(&trig->leddev_list_lock, flags);

		led_cdev->trigger = trig;



		if (trig->activate)

			trig->activate(led_cdev);

			ret = trig->activate(led_cdev);

		else

			ret = 0;



		if (ret)

			goto err_activate;

	}



	if (event) {
@@ -146,6 +153,17 @@ void led_trigger_set(struct led_classdev *led_cdev, struct led_trigger *trig) 
				"%s: Error sending uevent\n", __func__);

		kfree(event);

	}



	return 0;



err_activate:

	led_cdev->trigger = NULL;

	write_lock_irqsave(&led_cdev->trigger->leddev_list_lock, flags);

	list_del(&led_cdev->trig_list);

	write_unlock_irqrestore(&led_cdev->trigger->leddev_list_lock, flags);

	led_set_brightness(led_cdev, LED_OFF);



	return ret;

}

EXPORT_SYMBOL_GPL(led_trigger_set);

drivers/leds/trigger/ledtrig-activity.c

+5 −3
Original line number Diff line number Diff line
@@ -178,20 +178,20 @@ static ssize_t led_invert_store(struct device *dev, 


static DEVICE_ATTR(invert, 0644, led_invert_show, led_invert_store);



static void activity_activate(struct led_classdev *led_cdev)

static int activity_activate(struct led_classdev *led_cdev)

{

	struct activity_data *activity_data;

	int rc;



	activity_data = kzalloc(sizeof(*activity_data), GFP_KERNEL);

	if (!activity_data)

		return;

		return 0;



	led_cdev->trigger_data = activity_data;

	rc = device_create_file(led_cdev->dev, &dev_attr_invert);

	if (rc) {

		kfree(led_cdev->trigger_data);

		return;

		return 0;

	}



	activity_data->led_cdev = led_cdev;
@@ -201,6 +201,8 @@ static void activity_activate(struct led_classdev *led_cdev) 
	led_activity_function(&activity_data->timer);

	set_bit(LED_BLINK_SW, &led_cdev->work_flags);

	led_cdev->activated = true;



	return 0;

}



static void activity_deactivate(struct led_classdev *led_cdev)

drivers/leds/trigger/ledtrig-backlight.c

+5 −3
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static ssize_t bl_trig_invert_store(struct device *dev, 
}

static DEVICE_ATTR(inverted, 0644, bl_trig_invert_show, bl_trig_invert_store);



static void bl_trig_activate(struct led_classdev *led)

static int bl_trig_activate(struct led_classdev *led)

{

	int ret;
@@ -107,7 +107,7 @@ static void bl_trig_activate(struct led_classdev *led) 
	led->trigger_data = n;

	if (!n) {

		dev_err(led->dev, "unable to allocate backlight trigger\n");

		return;

		return 0;

	}



	ret = device_create_file(led->dev, &dev_attr_inverted);
@@ -124,11 +124,13 @@ static void bl_trig_activate(struct led_classdev *led) 
		dev_err(led->dev, "unable to register backlight trigger\n");

	led->activated = true;



	return;

	return 0;



err_invert:

	led->trigger_data = NULL;

	kfree(n);



	return 0;

}



static void bl_trig_deactivate(struct led_classdev *led)

drivers/leds/trigger/ledtrig-default-on.c

+2 −1
Original line number Diff line number Diff line
@@ -16,9 +16,10 @@ 
#include <linux/leds.h>

#include "../leds.h"



static void defon_trig_activate(struct led_classdev *led_cdev)

static int defon_trig_activate(struct led_classdev *led_cdev)

{

	led_set_brightness_nosleep(led_cdev, led_cdev->max_brightness);

	return 0;

}



static struct led_trigger defon_led_trigger = {

drivers/leds/trigger/ledtrig-gpio.c

+5 −3
Original line number Diff line number Diff line
@@ -162,14 +162,14 @@ static ssize_t gpio_trig_gpio_store(struct device *dev, 
}

static DEVICE_ATTR(gpio, 0644, gpio_trig_gpio_show, gpio_trig_gpio_store);



static void gpio_trig_activate(struct led_classdev *led)

static int gpio_trig_activate(struct led_classdev *led)

{

	struct gpio_trig_data *gpio_data;

	int ret;



	gpio_data = kzalloc(sizeof(*gpio_data), GFP_KERNEL);

	if (!gpio_data)

		return;

		return 0;



	ret = device_create_file(led->dev, &dev_attr_gpio);

	if (ret)
@@ -187,7 +187,7 @@ static void gpio_trig_activate(struct led_classdev *led) 
	led->trigger_data = gpio_data;

	led->activated = true;



	return;

	return 0;



err_brightness:

	device_remove_file(led->dev, &dev_attr_inverted);
@@ -197,6 +197,8 @@ static void gpio_trig_activate(struct led_classdev *led) 


err_gpio:

	kfree(gpio_data);



	return 0;

}



static void gpio_trig_deactivate(struct led_classdev *led)