Commit e298d8a3 authored by Hans de Goede's avatar Hans de Goede Committed by Lee Jones
Browse files

leds: Change led_trigger_blink[_oneshot]() delay parameters to pass-by-value 



led_blink_set[_oneshot]()'s delay_on and delay_off function parameters
are pass by reference, so that hw-blink implementations can report
back the actual achieved delays when the values have been rounded
to something the hw supports.

This is really only interesting for the sysfs API / the timer trigger.
Other triggers don't really care about this and none of the callers of
led_trigger_blink[_oneshot]() do anything with the returned delay values.

Change the led_trigger_blink[_oneshot]() delay parameters to pass-by-value,
there are 2 reasons for this:

1. led_cdev->blink_set() may sleep, while led_trigger_blink() may not.
So on hw where led_cdev->blink_set() sleeps the call needs to be deferred
to a workqueue, in which case the actual achieved delays are unknown
(this is a preparation patch for the deferring).

2. Since the callers don't care about the actual achieved delays, allowing
callers to directly pass a value leads to simpler code for most callers.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarJacek Anaszewski <jacek.anaszewski@gmail.com>
Tested-by: default avatarYauhen Kharuzhy <jekhor@gmail.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Acked-by: default avatarFlorian Westphal <fw@strlen.de>
Link: https://lore.kernel.org/r/20230510162234.291439-2-hdegoede@redhat.com


Signed-off-by: default avatarLee Jones <lee@kernel.org>
parent d9ff8a8e

drivers/leds/led-triggers.c

+8 −8
Original line number Diff line number Diff line
@@ -393,8 +393,8 @@ void led_trigger_event(struct led_trigger *trig, 
EXPORT_SYMBOL_GPL(led_trigger_event);



static void led_trigger_blink_setup(struct led_trigger *trig,

			     unsigned long *delay_on,

			     unsigned long *delay_off,

			     unsigned long delay_on,

			     unsigned long delay_off,

			     int oneshot,

			     int invert)

{
@@ -406,25 +406,25 @@ static void led_trigger_blink_setup(struct led_trigger *trig, 
	rcu_read_lock();

	list_for_each_entry_rcu(led_cdev, &trig->led_cdevs, trig_list) {

		if (oneshot)

			led_blink_set_oneshot(led_cdev, delay_on, delay_off,

			led_blink_set_oneshot(led_cdev, &delay_on, &delay_off,

					      invert);

		else

			led_blink_set(led_cdev, delay_on, delay_off);

			led_blink_set(led_cdev, &delay_on, &delay_off);

	}

	rcu_read_unlock();

}



void led_trigger_blink(struct led_trigger *trig,

		       unsigned long *delay_on,

		       unsigned long *delay_off)

		       unsigned long delay_on,

		       unsigned long delay_off)

{

	led_trigger_blink_setup(trig, delay_on, delay_off, 0, 0);

}

EXPORT_SYMBOL_GPL(led_trigger_blink);



void led_trigger_blink_oneshot(struct led_trigger *trig,

			       unsigned long *delay_on,

			       unsigned long *delay_off,

			       unsigned long delay_on,

			       unsigned long delay_off,

			       int invert)

{

	led_trigger_blink_setup(trig, delay_on, delay_off, 1, invert);

drivers/leds/trigger/ledtrig-disk.c

+3 −6
Original line number Diff line number Diff line
@@ -19,16 +19,13 @@ DEFINE_LED_TRIGGER(ledtrig_disk_write); 


void ledtrig_disk_activity(bool write)

{

	unsigned long blink_delay = BLINK_DELAY;



	led_trigger_blink_oneshot(ledtrig_disk,

				  &blink_delay, &blink_delay, 0);

	led_trigger_blink_oneshot(ledtrig_disk, BLINK_DELAY, BLINK_DELAY, 0);

	if (write)

		led_trigger_blink_oneshot(ledtrig_disk_write,

					  &blink_delay, &blink_delay, 0);

					  BLINK_DELAY, BLINK_DELAY, 0);

	else

		led_trigger_blink_oneshot(ledtrig_disk_read,

					  &blink_delay, &blink_delay, 0);

					  BLINK_DELAY, BLINK_DELAY, 0);

}

EXPORT_SYMBOL(ledtrig_disk_activity);

drivers/leds/trigger/ledtrig-mtd.c

+2 −6
Original line number Diff line number Diff line
@@ -22,12 +22,8 @@ DEFINE_LED_TRIGGER(ledtrig_nand); 


void ledtrig_mtd_activity(void)

{

	unsigned long blink_delay = BLINK_DELAY;



	led_trigger_blink_oneshot(ledtrig_mtd,

				  &blink_delay, &blink_delay, 0);

	led_trigger_blink_oneshot(ledtrig_nand,

				  &blink_delay, &blink_delay, 0);

	led_trigger_blink_oneshot(ledtrig_mtd, BLINK_DELAY, BLINK_DELAY, 0);

	led_trigger_blink_oneshot(ledtrig_nand, BLINK_DELAY, BLINK_DELAY, 0);

}

EXPORT_SYMBOL(ledtrig_mtd_activity);

drivers/net/arcnet/arcnet.c

+2 −6
Original line number Diff line number Diff line
@@ -196,13 +196,10 @@ static void arcnet_dump_packet(struct net_device *dev, int bufnum, 
void arcnet_led_event(struct net_device *dev, enum arcnet_led_event event)

{

	struct arcnet_local *lp = netdev_priv(dev);

	unsigned long led_delay = 350;

	unsigned long tx_delay = 50;



	switch (event) {

	case ARCNET_LED_EVENT_RECON:

		led_trigger_blink_oneshot(lp->recon_led_trig,

					  &led_delay, &led_delay, 0);

		led_trigger_blink_oneshot(lp->recon_led_trig, 350, 350, 0);

		break;

	case ARCNET_LED_EVENT_OPEN:

		led_trigger_event(lp->tx_led_trig, LED_OFF);
@@ -213,8 +210,7 @@ void arcnet_led_event(struct net_device *dev, enum arcnet_led_event event) 
		led_trigger_event(lp->recon_led_trig, LED_OFF);

		break;

	case ARCNET_LED_EVENT_TX:

		led_trigger_blink_oneshot(lp->tx_led_trig,

					  &tx_delay, &tx_delay, 0);

		led_trigger_blink_oneshot(lp->tx_led_trig, 50, 50, 0);

		break;

	}

}

drivers/power/supply/power_supply_leds.c

+1 −4
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 
static void power_supply_update_bat_leds(struct power_supply *psy)

{

	union power_supply_propval status;

	unsigned long delay_on = 0;

	unsigned long delay_off = 0;



	if (power_supply_get_property(psy, POWER_SUPPLY_PROP_STATUS, &status))

		return;
@@ -42,8 +40,7 @@ static void power_supply_update_bat_leds(struct power_supply *psy) 
		led_trigger_event(psy->charging_full_trig, LED_FULL);

		led_trigger_event(psy->charging_trig, LED_FULL);

		led_trigger_event(psy->full_trig, LED_OFF);

		led_trigger_blink(psy->charging_blink_full_solid_trig,

			&delay_on, &delay_off);

		led_trigger_blink(psy->charging_blink_full_solid_trig, 0, 0);

		break;

	default:

		led_trigger_event(psy->charging_full_trig, LED_OFF);