net: fs_enet: Remove has_phy field in fs_platform_info struct

Since commit 3dd82a1ea724 ("[POWERPC] CPM: Always use new binding.")
has_phy field is never set.

Remove dead code and remove the field.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/bb5264e09e18f0ce8a0dbee399926a59f33cb248.1691155346.git.christophe.leroy@csgroup.eu
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/freescale/fs_enet/mac-fec.c b/drivers/net/ethernet/freescale/fs_enet/mac-fec.c
index f609dc1..cdc89d8 100644 (file)
--- a/drivers/net/ethernet/freescale/fs_enet/mac-fec.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mac-fec.c
@@ -339,11 +339,7 @@ static void restart(struct net_device *dev)
 static void stop(struct net_device *dev)
 {
        struct fs_enet_private *fep = netdev_priv(dev);
-       const struct fs_platform_info *fpi = fep->fpi;
        struct fec __iomem *fecp = fep->fec.fecp;
-
-       struct fec_info *feci = dev->phydev->mdio.bus->priv;
-
        int i;
 
        if ((FR(fecp, ecntrl) & FEC_ECNTRL_ETHER_EN) == 0)
@@ -363,16 +359,6 @@ static void stop(struct net_device *dev)
        FC(fecp, ecntrl, FEC_ECNTRL_ETHER_EN);
 
        fs_cleanup_bds(dev);
-
-       /* shut down FEC1? that's where the mii bus is */
-       if (fpi->has_phy) {
-               FS(fecp, r_cntrl, fpi->use_rmii ?
-                               FEC_RCNTRL_RMII_MODE :
-                               FEC_RCNTRL_MII_MODE);   /* MII/RMII enable */
-               FS(fecp, ecntrl, FEC_ECNTRL_PINMUX | FEC_ECNTRL_ETHER_EN);
-               FW(fecp, ievent, FEC_ENET_MII);
-               FW(fecp, mii_speed, feci->mii_speed);
-       }
 }
 
 static void napi_clear_event_fs(struct net_device *dev)

diff --git a/include/linux/fs_enet_pd.h b/include/linux/fs_enet_pd.h
index a1905e4..2b351b6 100644 (file)
--- a/include/linux/fs_enet_pd.h
+++ b/include/linux/fs_enet_pd.h
@@ -123,7 +123,6 @@ struct fs_platform_info {
        int napi_weight;        /* NAPI weight                 */
 
        int use_rmii;           /* use RMII mode               */
-       int has_phy;            /* if the network is phy container as well...*/
 
        struct clk *clk_per;    /* 'per' clock for register access */
 };