dpaa2-mac: remove an unnecessary check

The dpaa2-eth driver has phylink integration only if the connected dpmac
object is in TYPE_PHY (aka the PCS/PHY etc link status is managed by
Linux instead of the firmware). The check is thus unnecessary because
the code path that reaches the .mac_link_up() callback is only with
TYPE_PHY dpmac objects.

Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
index 81b2822a7dc9f59210c0b42fdf3753986f7ba0ea..3869c38f397911bd1a77d9196c7363fe944e168a 100644 (file)
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
@@ -174,30 +174,25 @@ static void dpaa2_mac_link_up(struct phylink_config *config,
 
        dpmac_state->up = 1;
 
-       if (mac->if_link_type == DPMAC_LINK_TYPE_PHY) {
-               /* If the DPMAC is configured for PHY mode, we need
-                * to pass the link parameters to the MC firmware.
-                */
-               dpmac_state->rate = speed;
-
-               if (duplex == DUPLEX_HALF)
-                       dpmac_state->options |= DPMAC_LINK_OPT_HALF_DUPLEX;
-               else if (duplex == DUPLEX_FULL)
-                       dpmac_state->options &= ~DPMAC_LINK_OPT_HALF_DUPLEX;
-
-               /* This is lossy; the firmware really should take the pause
-                * enablement status rather than pause/asym pause status.
-                */
-               if (rx_pause)
-                       dpmac_state->options |= DPMAC_LINK_OPT_PAUSE;
-               else
-                       dpmac_state->options &= ~DPMAC_LINK_OPT_PAUSE;
-
-               if (rx_pause ^ tx_pause)
-                       dpmac_state->options |= DPMAC_LINK_OPT_ASYM_PAUSE;
-               else
-                       dpmac_state->options &= ~DPMAC_LINK_OPT_ASYM_PAUSE;
-       }
+       dpmac_state->rate = speed;
+
+       if (duplex == DUPLEX_HALF)
+               dpmac_state->options |= DPMAC_LINK_OPT_HALF_DUPLEX;
+       else if (duplex == DUPLEX_FULL)
+               dpmac_state->options &= ~DPMAC_LINK_OPT_HALF_DUPLEX;
+
+       /* This is lossy; the firmware really should take the pause
+        * enablement status rather than pause/asym pause status.
+        */
+       if (rx_pause)
+               dpmac_state->options |= DPMAC_LINK_OPT_PAUSE;
+       else
+               dpmac_state->options &= ~DPMAC_LINK_OPT_PAUSE;
+
+       if (rx_pause ^ tx_pause)
+               dpmac_state->options |= DPMAC_LINK_OPT_ASYM_PAUSE;
+       else
+               dpmac_state->options &= ~DPMAC_LINK_OPT_ASYM_PAUSE;
 
        err = dpmac_set_link_state(mac->mc_io, 0,
                                   mac->mc_dev->mc_handle, dpmac_state);