net: phy: leds: Refactor "no link" handler into a separate function

Currently, phy_led_trigger_change_speed() is handling a "no link" condition
like it was some kind of an error (using "goto" to a code at the function
end).

However, having no link at PHY is an ordinary operational state, so let's
handle it in an appropriately named separate function so it is more obvious
what the code is doing.

Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/phy_led_triggers.c b/drivers/net/phy/phy_led_triggers.c
index 94ca42e630bbead0c4fcae0b2ef6c8b19296bb69..c736f29b3b2af945946d83659082036bdbd67133 100644 (file)
--- a/drivers/net/phy/phy_led_triggers.c
+++ b/drivers/net/phy/phy_led_triggers.c
@@ -27,12 +27,20 @@ static struct phy_led_trigger *phy_speed_to_led_trigger(struct phy_device *phy,
        return NULL;
 }
 
+static void phy_led_trigger_no_link(struct phy_device *phy)
+{
+       if (phy->last_triggered) {
+               led_trigger_event(&phy->last_triggered->trigger, LED_OFF);
+               phy->last_triggered = NULL;
+       }
+}
+
 void phy_led_trigger_change_speed(struct phy_device *phy)
 {
        struct phy_led_trigger *plt;
 
        if (!phy->link)
-               goto out_change_speed;
+               return phy_led_trigger_no_link(phy);
 
        if (phy->speed == 0)
                return;
@@ -42,7 +50,7 @@ void phy_led_trigger_change_speed(struct phy_device *phy)
                netdev_alert(phy->attached_dev,
                             "No phy led trigger registered for speed(%d)\n",
                             phy->speed);
-               goto out_change_speed;
+               return phy_led_trigger_no_link(phy);
        }
 
        if (plt != phy->last_triggered) {
@@ -50,14 +58,6 @@ void phy_led_trigger_change_speed(struct phy_device *phy)
                led_trigger_event(&plt->trigger, LED_FULL);
                phy->last_triggered = plt;
        }
-       return;
-
-out_change_speed:
-       if (phy->last_triggered) {
-               led_trigger_event(&phy->last_triggered->trigger,
-                                 LED_OFF);
-               phy->last_triggered = NULL;
-       }
 }
 EXPORT_SYMBOL_GPL(phy_led_trigger_change_speed);