net: phy: leds: Deduplicate link LED trigger registration
Subsystems (3)
PATCH v3 1/1 net: phy: leds: Deduplicate link LED trigger registration
Refactor phy_led_trigger_register() and deduplicate its functionality when registering LED trigger for link.
Signed-off-by Andy Shevchenko <[email protected]>
Reviewed-by Andrew Lunn <[email protected]>
---
v3: rebased on top of v5.10-rc1
drivers/net/phy/phy_led_triggers.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
drivers/net/phy/phy_led_triggers.c +5 -10
@@ -66,11 +66,11 @@ static void phy_led_trigger_format_name(struct phy_device *phy, char *buf,static int phy_led_trigger_register (struct phy_device *phy,struct phy_led_trigger *plt, -unsigned int speed) +unsigned int speed, +const char *suffix) { plt->speed = speed; -phy_led_trigger_format_name (phy, plt->name,sizeof (plt->name), -phy_speed_to_str (speed)); +phy_led_trigger_format_name (phy, plt->name,sizeof (plt->name), suffix); plt->trigger.name = plt->name;return led_trigger_register (&plt->trigger);
@@ -99,12 +99,7 @@ int phy_led_triggers_register(struct phy_device *phy) goto out_clear; } -phy_led_trigger_format_name (phy, phy->led_link_trigger->name, -sizeof (phy->led_link_trigger->name), -"link" ); - phy->led_link_trigger->trigger.name = phy->led_link_trigger->name; - - err =led_trigger_register (&phy->led_link_trigger->trigger); + err =phy_led_trigger_register (phy, phy->led_link_trigger,0 ,"link" );if (err) goto out_free_link;
@@ -119,7 +114,7 @@ int phy_led_triggers_register(struct phy_device *phy)for (i =0 ; i < phy->phy_num_led_triggers; i++) { err =phy_led_trigger_register (phy, &phy->phy_led_triggers[i], - speeds[i]); + speeds[i],phy_speed_to_str (speeds[i]));if (err) goto out_unreg; }
Signature · 1 line
2.28.0
Quoted 5 lines · On Tue, 27 Oct 2020 20:21:46 +0200 Andy Shevchenko wrote:
Refactor
phy_led_trigger_register()and deduplicate its functionality when registering LED trigger for link.Signed-off-by Andy Shevchenko <[email protected]>Reviewed-by Andrew Lunn <[email protected]>
Applied..
drivers/net/phy/phy_led_triggers.c int phy_led_triggers_register(struct phy_device *phy) · line 117
Quoted 6 lines
drivers/net/phy/phy_led_triggers.c +1
-1@@ -119,7 +114,7 @@ int phy_led_triggers_register(struct phy_device *phy)for (i =0 ; i < phy->phy_num_led_triggers; i++) { err =phy_led_trigger_register (phy, &phy->phy_led_triggers[i], - speeds[i]); + speeds[i],phy_speed_to_str (speeds[i]));
after wrapping this to 80 chars.