net: phylink: remove switch() statement in resolve handling

The switch() statement doesn't sit very well with the preceeding if()
statements, so let's just convert everything to if()s. As a result of
the two preceding commits, there is now only one case in the switch()
statement. Remove the switch statement and reduce the code indentation.
Code reformatting will be in the following commit.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1t9RQu-002Fez-AA@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 3af6368a9fbfc9ddf67704ae279a2b2f4f47448a..aaeb8b11e75844ea1028ef6c6250bd71de1286b1 100644 (file)
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -1470,60 +1470,56 @@ static void phylink_resolve(struct work_struct *w)
                link_state = pl->phy_state;
                mac_config = link_state.link;
        } else {
-               switch (pl->cur_link_an_mode) {
-               case MLO_AN_INBAND:
-                       phylink_mac_pcs_get_state(pl, &link_state);
-
-                       /* The PCS may have a latching link-fail indicator.
-                        * If the link was up, bring the link down and
-                        * re-trigger the resolve. Otherwise, re-read the
-                        * PCS state to get the current status of the link.
+               phylink_mac_pcs_get_state(pl, &link_state);
+
+               /* The PCS may have a latching link-fail indicator.
+                * If the link was up, bring the link down and
+                * re-trigger the resolve. Otherwise, re-read the
+                * PCS state to get the current status of the link.
+                */
+               if (!link_state.link) {
+                       if (cur_link_state)
+                               retrigger = true;
+                       else
+                               phylink_mac_pcs_get_state(pl,
+                                                         &link_state);
+               }
+
+               /* If we have a phy, the "up" state is the union of
+                * both the PHY and the MAC
+                */
+               if (pl->phydev)
+                       link_state.link &= pl->phy_state.link;
+
+               /* Only update if the PHY link is up */
+               if (pl->phydev && pl->phy_state.link) {
+                       /* If the interface has changed, force a
+                        * link down event if the link isn't already
+                        * down, and re-resolve.
                         */
-                       if (!link_state.link) {
-                               if (cur_link_state)
-                                       retrigger = true;
-                               else
-                                       phylink_mac_pcs_get_state(pl,
-                                                                 &link_state);
+                       if (link_state.interface !=
+                           pl->phy_state.interface) {
+                               retrigger = true;
+                               link_state.link = false;
                        }
+                       link_state.interface = pl->phy_state.interface;
 
-                       /* If we have a phy, the "up" state is the union of
-                        * both the PHY and the MAC
+                       /* If we are doing rate matching, then the
+                        * link speed/duplex comes from the PHY
                         */
-                       if (pl->phydev)
-                               link_state.link &= pl->phy_state.link;
-
-                       /* Only update if the PHY link is up */
-                       if (pl->phydev && pl->phy_state.link) {
-                               /* If the interface has changed, force a
-                                * link down event if the link isn't already
-                                * down, and re-resolve.
-                                */
-                               if (link_state.interface !=
-                                   pl->phy_state.interface) {
-                                       retrigger = true;
-                                       link_state.link = false;
-                               }
-                               link_state.interface = pl->phy_state.interface;
-
-                               /* If we are doing rate matching, then the
-                                * link speed/duplex comes from the PHY
-                                */
-                               if (pl->phy_state.rate_matching) {
-                                       link_state.rate_matching =
-                                               pl->phy_state.rate_matching;
-                                       link_state.speed = pl->phy_state.speed;
-                                       link_state.duplex =
-                                               pl->phy_state.duplex;
-                               }
-
-                               /* If we have a PHY, we need to update with
-                                * the PHY flow control bits.
-                                */
-                               link_state.pause = pl->phy_state.pause;
-                               mac_config = true;
+                       if (pl->phy_state.rate_matching) {
+                               link_state.rate_matching =
+                                       pl->phy_state.rate_matching;
+                               link_state.speed = pl->phy_state.speed;
+                               link_state.duplex =
+                                       pl->phy_state.duplex;
                        }
-                       break;
+
+                       /* If we have a PHY, we need to update with
+                        * the PHY flow control bits.
+                        */
+                       link_state.pause = pl->phy_state.pause;
+                       mac_config = true;
                }
        }