Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 09:16:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
Tested-by: Yauhen Kharuzhy <jekhor@gmail.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Acked-by: Florian Westphal <fw@strlen.de>
Link: https://lore.kernel.org/r/20230510162234.291439-2-hdegoede@redhat.com
Signed-off-by: Lee Jones <lee@kernel.org>
This commit is contained in:
Hans de Goede 2023-05-10 18:22:31 +02:00 committed by Lee Jones
parent d9ff8a8eec
commit e298d8a38b
10 changed files with 29 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/leds/led-triggers.c
View File

@ -393,8 +393,8 @@ void led_trigger_event(struct led_trigger *trig,
EXPORT_SYMBOL_GPL(led_trigger_event); EXPORT_SYMBOL_GPL(led_trigger_event);
static void led_trigger_blink_setup(struct led_trigger *trig, static void led_trigger_blink_setup(struct led_trigger *trig,
unsigned long *delay_on, unsigned long delay_on,
unsigned long *delay_off, unsigned long delay_off,
int oneshot, int oneshot,
int invert) int invert)
{ {
@ -406,25 +406,25 @@ static void led_trigger_blink_setup(struct led_trigger *trig,
rcu_read_lock(); rcu_read_lock();
list_for_each_entry_rcu(led_cdev, &trig->led_cdevs, trig_list) { list_for_each_entry_rcu(led_cdev, &trig->led_cdevs, trig_list) {
if (oneshot) if (oneshot)
led_blink_set_oneshot(led_cdev, delay_on, delay_off, led_blink_set_oneshot(led_cdev, &delay_on, &delay_off,
invert); invert);
else else
led_blink_set(led_cdev, delay_on, delay_off); led_blink_set(led_cdev, &delay_on, &delay_off);
} }
rcu_read_unlock(); rcu_read_unlock();
} }
void led_trigger_blink(struct led_trigger *trig, void led_trigger_blink(struct led_trigger *trig,
unsigned long *delay_on, unsigned long delay_on,
unsigned long *delay_off) unsigned long delay_off)
{ {
led_trigger_blink_setup(trig, delay_on, delay_off, 0, 0); led_trigger_blink_setup(trig, delay_on, delay_off, 0, 0);
} }
EXPORT_SYMBOL_GPL(led_trigger_blink); EXPORT_SYMBOL_GPL(led_trigger_blink);
void led_trigger_blink_oneshot(struct led_trigger *trig, void led_trigger_blink_oneshot(struct led_trigger *trig,
unsigned long *delay_on, unsigned long delay_on,
unsigned long *delay_off, unsigned long delay_off,
int invert) int invert)
{ {
led_trigger_blink_setup(trig, delay_on, delay_off, 1, invert); led_trigger_blink_setup(trig, delay_on, delay_off, 1, invert);

9
drivers/leds/trigger/ledtrig-disk.c
View File

@ -19,16 +19,13 @@ DEFINE_LED_TRIGGER(ledtrig_disk_write);
void ledtrig_disk_activity(bool 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) if (write)
led_trigger_blink_oneshot(ledtrig_disk_write, led_trigger_blink_oneshot(ledtrig_disk_write,
&blink_delay, &blink_delay, 0); BLINK_DELAY, BLINK_DELAY, 0);
else else
led_trigger_blink_oneshot(ledtrig_disk_read, led_trigger_blink_oneshot(ledtrig_disk_read,
&blink_delay, &blink_delay, 0); BLINK_DELAY, BLINK_DELAY, 0);
} }
EXPORT_SYMBOL(ledtrig_disk_activity); EXPORT_SYMBOL(ledtrig_disk_activity);

8
drivers/leds/trigger/ledtrig-mtd.c
View File

@ -22,12 +22,8 @@ DEFINE_LED_TRIGGER(ledtrig_nand);
void ledtrig_mtd_activity(void) 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); EXPORT_SYMBOL(ledtrig_mtd_activity);

8
drivers/net/arcnet/arcnet.c
View File

@ -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) void arcnet_led_event(struct net_device *dev, enum arcnet_led_event event)
{ {
struct arcnet_local *lp = netdev_priv(dev); struct arcnet_local *lp = netdev_priv(dev);
unsigned long led_delay = 350;
unsigned long tx_delay = 50;
switch (event) { switch (event) {
case ARCNET_LED_EVENT_RECON: case ARCNET_LED_EVENT_RECON:
led_trigger_blink_oneshot(lp->recon_led_trig, led_trigger_blink_oneshot(lp->recon_led_trig, 350, 350, 0);
&led_delay, &led_delay, 0);
break; break;
case ARCNET_LED_EVENT_OPEN: case ARCNET_LED_EVENT_OPEN:
led_trigger_event(lp->tx_led_trig, LED_OFF); 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); led_trigger_event(lp->recon_led_trig, LED_OFF);
break; break;
case ARCNET_LED_EVENT_TX: case ARCNET_LED_EVENT_TX:
led_trigger_blink_oneshot(lp->tx_led_trig, led_trigger_blink_oneshot(lp->tx_led_trig, 50, 50, 0);
&tx_delay, &tx_delay, 0);
break; break;
} }
} }

5
drivers/power/supply/power_supply_leds.c
View File

@ -22,8 +22,6 @@
static void power_supply_update_bat_leds(struct power_supply *psy) static void power_supply_update_bat_leds(struct power_supply *psy)
{ {
union power_supply_propval status; 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)) if (power_supply_get_property(psy, POWER_SUPPLY_PROP_STATUS, &status))
return; 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_full_trig, LED_FULL);
led_trigger_event(psy->charging_trig, LED_FULL); led_trigger_event(psy->charging_trig, LED_FULL);
led_trigger_event(psy->full_trig, LED_OFF); led_trigger_event(psy->full_trig, LED_OFF);
led_trigger_blink(psy->charging_blink_full_solid_trig, led_trigger_blink(psy->charging_blink_full_solid_trig, 0, 0);
&delay_on, &delay_off);
break; break;
default: default:
led_trigger_event(psy->charging_full_trig, LED_OFF); led_trigger_event(psy->charging_full_trig, LED_OFF);

4
drivers/usb/common/led.c
View File

@ -14,8 +14,6 @@
#define BLINK_DELAY 30 #define BLINK_DELAY 30
static unsigned long usb_blink_delay = BLINK_DELAY;
DEFINE_LED_TRIGGER(ledtrig_usb_gadget); DEFINE_LED_TRIGGER(ledtrig_usb_gadget);
DEFINE_LED_TRIGGER(ledtrig_usb_host); DEFINE_LED_TRIGGER(ledtrig_usb_host);
@ -32,7 +30,7 @@ void usb_led_activity(enum usb_led_event ev)
break; break;
} }
/* led_trigger_blink_oneshot() handles trig == NULL gracefully */ /* led_trigger_blink_oneshot() handles trig == NULL gracefully */
led_trigger_blink_oneshot(trig, &usb_blink_delay, &usb_blink_delay, 0); led_trigger_blink_oneshot(trig, BLINK_DELAY, BLINK_DELAY, 0);
} }
EXPORT_SYMBOL_GPL(usb_led_activity); EXPORT_SYMBOL_GPL(usb_led_activity);

16
include/linux/leds.h
View File

@ -433,11 +433,11 @@ void led_trigger_register_simple(const char *name,
struct led_trigger **trigger); struct led_trigger **trigger);
void led_trigger_unregister_simple(struct led_trigger *trigger); void led_trigger_unregister_simple(struct led_trigger *trigger);
void led_trigger_event(struct led_trigger *trigger, enum led_brightness event); void led_trigger_event(struct led_trigger *trigger, enum led_brightness event);
void led_trigger_blink(struct led_trigger *trigger, unsigned long *delay_on, void led_trigger_blink(struct led_trigger *trigger, unsigned long delay_on,
unsigned long *delay_off); unsigned long delay_off);
void led_trigger_blink_oneshot(struct led_trigger *trigger, void led_trigger_blink_oneshot(struct led_trigger *trigger,
unsigned long *delay_on, unsigned long delay_on,
unsigned long *delay_off, unsigned long delay_off,
int invert); int invert);
void led_trigger_set_default(struct led_classdev *led_cdev); void led_trigger_set_default(struct led_classdev *led_cdev);
int led_trigger_set(struct led_classdev *led_cdev, struct led_trigger *trigger); int led_trigger_set(struct led_classdev *led_cdev, struct led_trigger *trigger);
@ -487,11 +487,11 @@ static inline void led_trigger_unregister_simple(struct led_trigger *trigger) {}
static inline void led_trigger_event(struct led_trigger *trigger, static inline void led_trigger_event(struct led_trigger *trigger,
enum led_brightness event) {} enum led_brightness event) {}
static inline void led_trigger_blink(struct led_trigger *trigger, static inline void led_trigger_blink(struct led_trigger *trigger,
unsigned long *delay_on, unsigned long delay_on,
unsigned long *delay_off) {} unsigned long delay_off) {}
static inline void led_trigger_blink_oneshot(struct led_trigger *trigger, static inline void led_trigger_blink_oneshot(struct led_trigger *trigger,
unsigned long *delay_on, unsigned long delay_on,
unsigned long *delay_off, unsigned long delay_off,
int invert) {} int invert) {}
static inline void led_trigger_set_default(struct led_classdev *led_cdev) {} static inline void led_trigger_set_default(struct led_classdev *led_cdev) {}
static inline int led_trigger_set(struct led_classdev *led_cdev, static inline int led_trigger_set(struct led_classdev *led_cdev,

2
net/mac80211/led.c
View File

@ -282,7 +282,7 @@ static void tpt_trig_timer(struct timer_list *t)
} }
} }
led_trigger_blink(&local->tpt_led, &on, &off); led_trigger_blink(&local->tpt_led, on, off);
} }
const char * const char *

8
net/mac80211/led.h
View File

@ -13,22 +13,18 @@
static inline void ieee80211_led_rx(struct ieee80211_local *local) static inline void ieee80211_led_rx(struct ieee80211_local *local)
{ {
#ifdef CONFIG_MAC80211_LEDS #ifdef CONFIG_MAC80211_LEDS
unsigned long led_delay = MAC80211_BLINK_DELAY;
if (!atomic_read(&local->rx_led_active)) if (!atomic_read(&local->rx_led_active))
return; return;
led_trigger_blink_oneshot(&local->rx_led, &led_delay, &led_delay, 0); led_trigger_blink_oneshot(&local->rx_led, MAC80211_BLINK_DELAY, MAC80211_BLINK_DELAY, 0);
#endif #endif
} }
static inline void ieee80211_led_tx(struct ieee80211_local *local) static inline void ieee80211_led_tx(struct ieee80211_local *local)
{ {
#ifdef CONFIG_MAC80211_LEDS #ifdef CONFIG_MAC80211_LEDS
unsigned long led_delay = MAC80211_BLINK_DELAY;
if (!atomic_read(&local->tx_led_active)) if (!atomic_read(&local->tx_led_active))
return; return;
led_trigger_blink_oneshot(&local->tx_led, &led_delay, &led_delay, 0); led_trigger_blink_oneshot(&local->tx_led, MAC80211_BLINK_DELAY, MAC80211_BLINK_DELAY, 0);
#endif #endif
} }

3
net/netfilter/xt_LED.c
View File

@ -43,7 +43,6 @@ led_tg(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_led_info *ledinfo = par->targinfo; const struct xt_led_info *ledinfo = par->targinfo;
struct xt_led_info_internal *ledinternal = ledinfo->internal_data; struct xt_led_info_internal *ledinternal = ledinfo->internal_data;
unsigned long led_delay = XT_LED_BLINK_DELAY;
/* /*
* If "always blink" is enabled, and there's still some time until the * If "always blink" is enabled, and there's still some time until the
@ -52,7 +51,7 @@ led_tg(struct sk_buff *skb, const struct xt_action_param *par)
if ((ledinfo->delay > 0) && ledinfo->always_blink && if ((ledinfo->delay > 0) && ledinfo->always_blink &&
timer_pending(&ledinternal->timer)) timer_pending(&ledinternal->timer))
led_trigger_blink_oneshot(&ledinternal->netfilter_led_trigger, led_trigger_blink_oneshot(&ledinternal->netfilter_led_trigger,
&led_delay, &led_delay, 1); XT_LED_BLINK_DELAY, XT_LED_BLINK_DELAY, 1);
else else
led_trigger_event(&ledinternal->netfilter_led_trigger, LED_FULL); led_trigger_event(&ledinternal->netfilter_led_trigger, LED_FULL);