Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84eff6d1 authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

phy: add phydev_name() wrapper 



Add a phydev_name() function, to help with moving some structure members
from phy_device.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 72ba48be

drivers/net/ethernet/8390/ax88796.c

+1 −1
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ static int ax_mii_probe(struct net_device *dev) 
	ax->phy_dev = phy_dev;



	netdev_info(dev, "PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n",

		    phy_dev->drv->name, dev_name(&phy_dev->dev), phy_dev->irq);

		    phy_dev->drv->name, phydev_name(phy_dev), phy_dev->irq);



	return 0;

}

drivers/net/ethernet/adi/bfin_mac.c

+2 −2
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ static int mii_probe(struct net_device *dev, int phy_mode) 
		return -EINVAL;

	}



	phydev = phy_connect(dev, dev_name(&phydev->dev),

	phydev = phy_connect(dev, phydev_name(phydev),

			     &bfin_mac_adjust_link, phy_mode);



	if (IS_ERR(phydev)) {
@@ -446,7 +446,7 @@ static int mii_probe(struct net_device *dev, int phy_mode) 


	pr_info("attached PHY driver [%s] "

	        "(mii_bus:phy_addr=%s, irq=%d, mdc_clk=%dHz(mdc_div=%d)@sclk=%dMHz)\n",

	        phydev->drv->name, dev_name(&phydev->dev), phydev->irq,

		phydev->drv->name, phydev_name(phydev), phydev->irq,

	        MDC_CLK, mdc_div, sclk/1000000);



	return 0;

drivers/net/ethernet/agere/et131x.c

+2 −2
Original line number Diff line number Diff line
@@ -3265,7 +3265,7 @@ static int et131x_mii_probe(struct net_device *netdev) 
		return -ENODEV;

	}



	phydev = phy_connect(netdev, dev_name(&phydev->dev),

	phydev = phy_connect(netdev, phydev_name(phydev),

			     &et131x_adjust_link, PHY_INTERFACE_MODE_MII);



	if (IS_ERR(phydev)) {
@@ -3291,7 +3291,7 @@ static int et131x_mii_probe(struct net_device *netdev) 


	dev_info(&adapter->pdev->dev,

		 "attached PHY driver [%s] (mii_bus:phy_addr=%s)\n",

		 phydev->drv->name, dev_name(&phydev->dev));

		 phydev->drv->name, phydev_name(phydev));



	return 0;

}

drivers/net/ethernet/amd/au1000_eth.c

+2 −2
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ static int au1000_mii_probe(struct net_device *dev) 
	/* now we are supposed to have a proper phydev, to attach to... */

	BUG_ON(phydev->attached_dev);



	phydev = phy_connect(dev, dev_name(&phydev->dev),

	phydev = phy_connect(dev, phydev_name(phydev),

			     &au1000_adjust_link, PHY_INTERFACE_MODE_MII);



	if (IS_ERR(phydev)) {
@@ -585,7 +585,7 @@ static int au1000_mii_probe(struct net_device *dev) 


	netdev_info(dev, "attached PHY driver [%s] "

	       "(mii_bus:phy_addr=%s, irq=%d)\n",

	       phydev->drv->name, dev_name(&phydev->dev), phydev->irq);

	       phydev->drv->name, phydev_name(phydev), phydev->irq);



	return 0;

}

drivers/net/ethernet/broadcom/b44.c

+1 −1
Original line number Diff line number Diff line
@@ -2316,7 +2316,7 @@ static int b44_register_phy_one(struct b44 *bp) 
	bp->phy_addr = phydev->addr;



	dev_info(sdev->dev, "attached PHY driver [%s] (mii_bus:phy_addr=%s)\n",

		 phydev->drv->name, dev_name(&phydev->dev));

		 phydev->drv->name, phydev_name(phydev));



	return 0;