net: mvneta: Drop fixed_link member from private struct

Since this member is checked only at two places drop it and inline it's
usage.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c
index 4917857681f802020227d3c3e854b239768ca73b..378789b6325a568d02e00adc258d7f5394ac7418 100644 (file)
--- a/drivers/net/mvneta.c
+++ b/drivers/net/mvneta.c
@@ -273,7 +273,6 @@ struct mvneta_port {
        u16 rx_ring_size;
 
        phy_interface_t phy_interface;
-       bool fixed_link;
        unsigned int link;
        unsigned int duplex;
        unsigned int speed;
@@ -813,7 +812,7 @@ static void mvneta_defaults_set(struct mvneta_port *pp)
        mvreg_write(pp, MVNETA_SDMA_CONFIG, val);
 
        /* Enable PHY polling in hardware if not in fixed-link mode */
-       if (!pp->fixed_link) {
+       if (pp->phydev->phy_id != PHY_FIXED_ID) {
                mvreg_write(pp, MVNETA_PHY_ADDR, pp->phydev->addr);
 
                val = mvreg_read(pp, MVNETA_UNIT_CONTROL);
@@ -1173,7 +1172,7 @@ static void mvneta_adjust_link(struct udevice *dev)
                 * be added). Also, why is ADVERT_FC enabled if we don't enable
                 * inband AN at all?
                 */
-               if (pp->fixed_link)
+               if (pp->phydev->phy_id == PHY_FIXED_ID)
                        val = MVNETA_GMAC_FORCE_LINK_UP |
                              MVNETA_GMAC_IB_BYPASS_AN_EN |
                              MVNETA_GMAC_SET_FC_EN |
@@ -1431,8 +1430,6 @@ static int mvneta_start(struct udevice *dev)
                        return -ENODEV;
                }
 
-               pp->fixed_link = phydev->phy_id == PHY_FIXED_ID;
-
                pp->phydev = phydev;
                phy_config(phydev);
                phy_startup(phydev);