Skip to content

Commit 00d5109

Browse files
ffainellidavem330
authored andcommitted
Revert "net: bcmgenet: Remove init parameter from bcmgenet_mii_config"
This reverts commit 28b4591 ("net: bcmgenet: Remove init parameter from bcmgenet_mii_config") because in the process of moving from dev_info() to dev_info_once() we essentially lost the helpful printed messages once the second instance of the driver is loaded. dev_info_once() does not actually print the message once per device instance, but once period. Fixes: 28b4591 ("net: bcmgenet: Remove init parameter from bcmgenet_mii_config") Signed-off-by: Florian Fainelli <[email protected]> Reviewed-by: Doug Berger <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 1daa879 commit 00d5109

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

drivers/net/ethernet/broadcom/genet/bcmgenet.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3669,7 +3669,7 @@ static int bcmgenet_resume(struct device *d)
36693669

36703670
phy_init_hw(priv->phydev);
36713671
/* Speed settings must be restored */
3672-
bcmgenet_mii_config(priv->dev);
3672+
bcmgenet_mii_config(priv->dev, false);
36733673

36743674
/* disable ethernet MAC while updating its registers */
36753675
umac_enable_set(priv, CMD_TX_EN | CMD_RX_EN, false);

drivers/net/ethernet/broadcom/genet/bcmgenet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@ GENET_IO_MACRO(rbuf, GENET_RBUF_OFF);
698698

699699
/* MDIO routines */
700700
int bcmgenet_mii_init(struct net_device *dev);
701-
int bcmgenet_mii_config(struct net_device *dev);
701+
int bcmgenet_mii_config(struct net_device *dev, bool init);
702702
int bcmgenet_mii_probe(struct net_device *dev);
703703
void bcmgenet_mii_exit(struct net_device *dev);
704704
void bcmgenet_mii_reset(struct net_device *dev);

drivers/net/ethernet/broadcom/genet/bcmmii.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ static void bcmgenet_moca_phy_setup(struct bcmgenet_priv *priv)
238238
bcmgenet_fixed_phy_link_update);
239239
}
240240

241-
int bcmgenet_mii_config(struct net_device *dev)
241+
int bcmgenet_mii_config(struct net_device *dev, bool init)
242242
{
243243
struct bcmgenet_priv *priv = netdev_priv(dev);
244244
struct phy_device *phydev = priv->phydev;
@@ -327,7 +327,8 @@ int bcmgenet_mii_config(struct net_device *dev)
327327
bcmgenet_ext_writel(priv, reg, EXT_RGMII_OOB_CTRL);
328328
}
329329

330-
dev_info_once(kdev, "configuring instance for %s\n", phy_name);
330+
if (init)
331+
dev_info(kdev, "configuring instance for %s\n", phy_name);
331332

332333
return 0;
333334
}
@@ -375,7 +376,7 @@ int bcmgenet_mii_probe(struct net_device *dev)
375376
* PHY speed which is needed for bcmgenet_mii_config() to configure
376377
* things appropriately.
377378
*/
378-
ret = bcmgenet_mii_config(dev);
379+
ret = bcmgenet_mii_config(dev, true);
379380
if (ret) {
380381
phy_disconnect(priv->phydev);
381382
return ret;

0 commit comments

Comments
 (0)