tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Christophe Leroy and committed by
Jakub Kicinski 9359a48c caaf482e

-15
-14
drivers/net/ethernet/freescale/fs_enet/mac-fec.c
··· 339 339 static void stop(struct net_device *dev) 340 340 { 341 341 struct fs_enet_private *fep = netdev_priv(dev); 342 - const struct fs_platform_info *fpi = fep->fpi; 343 342 struct fec __iomem *fecp = fep->fec.fecp; 344 - 345 - struct fec_info *feci = dev->phydev->mdio.bus->priv; 346 - 347 343 int i; 348 344 349 345 if ((FR(fecp, ecntrl) & FEC_ECNTRL_ETHER_EN) == 0) ··· 359 363 FC(fecp, ecntrl, FEC_ECNTRL_ETHER_EN); 360 364 361 365 fs_cleanup_bds(dev); 362 - 363 - /* shut down FEC1? that's where the mii bus is */ 364 - if (fpi->has_phy) { 365 - FS(fecp, r_cntrl, fpi->use_rmii ? 366 - FEC_RCNTRL_RMII_MODE : 367 - FEC_RCNTRL_MII_MODE); /* MII/RMII enable */ 368 - FS(fecp, ecntrl, FEC_ECNTRL_PINMUX | FEC_ECNTRL_ETHER_EN); 369 - FW(fecp, ievent, FEC_ENET_MII); 370 - FW(fecp, mii_speed, feci->mii_speed); 371 - } 372 366 } 373 367 374 368 static void napi_clear_event_fs(struct net_device *dev)
-1
include/linux/fs_enet_pd.h
··· 123 123 int napi_weight; /* NAPI weight */ 124 124 125 125 int use_rmii; /* use RMII mode */ 126 - int has_phy; /* if the network is phy container as well...*/ 127 126 128 127 struct clk *clk_per; /* 'per' clock for register access */ 129 128 };