* [PATCH v3] net: phy: leds: Deduplicate link LED trigger registration
@ 2020-10-27 18:21 Andy Shevchenko
2020-10-30 17:45 ` Jakub Kicinski
0 siblings, 1 reply; 2+ messages in thread
From: Andy Shevchenko @ 2020-10-27 18:21 UTC (permalink / raw)
To: Florian Fainelli, Heiner Kallweit, netdev, Russell King, David Miller
Cc: Andy Shevchenko, Andrew Lunn
Refactor phy_led_trigger_register() and deduplicate its functionality
when registering LED trigger for link.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
---
v3: rebased on top of v5.10-rc1
drivers/net/phy/phy_led_triggers.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/drivers/net/phy/phy_led_triggers.c b/drivers/net/phy/phy_led_triggers.c
index 59a94e07e7c5..08a3e9ea4102 100644
--- a/drivers/net/phy/phy_led_triggers.c
+++ b/drivers/net/phy/phy_led_triggers.c
@@ -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;
}
--
2.28.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v3] net: phy: leds: Deduplicate link LED trigger registration
2020-10-27 18:21 [PATCH v3] net: phy: leds: Deduplicate link LED trigger registration Andy Shevchenko
@ 2020-10-30 17:45 ` Jakub Kicinski
0 siblings, 0 replies; 2+ messages in thread
From: Jakub Kicinski @ 2020-10-30 17:45 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Florian Fainelli, Heiner Kallweit, netdev, Russell King,
David Miller, Andrew Lunn
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 <andriy.shevchenko@linux.intel.com>
> Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Applied..
> @@ -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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-30 17:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-27 18:21 [PATCH v3] net: phy: leds: Deduplicate link LED trigger registration Andy Shevchenko
2020-10-30 17:45 ` Jakub Kicinski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).