Commit c2313557 authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman
Browse files

net: struct device - replace bus_id with dev_name(), dev_set_name() 



Cc: davem@davemloft.net
Cc: netdev@vger.kernel.org
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
parent 744bcb13

drivers/net/arm/ks8695net.c

+1 −1
Original line number Diff line number Diff line
@@ -1059,7 +1059,7 @@ ks8695_get_drvinfo(struct net_device *ndev, struct ethtool_drvinfo *info) 
{

	strlcpy(info->driver, MODULENAME, sizeof(info->driver));

	strlcpy(info->version, MODULEVERSION, sizeof(info->version));

	strlcpy(info->bus_info, ndev->dev.parent->bus_id,

	strlcpy(info->bus_info, dev_name(ndev->dev.parent),

		sizeof(info->bus_info));

}

drivers/net/au1000_eth.c

+4 −4
Original line number Diff line number Diff line
@@ -355,8 +355,8 @@ static int 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, phydev->dev.bus_id, &au1000_adjust_link, 0,

			PHY_INTERFACE_MODE_MII);

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

			0, PHY_INTERFACE_MODE_MII);



	if (IS_ERR(phydev)) {

		printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name);
@@ -381,8 +381,8 @@ static int mii_probe (struct net_device *dev) 
	aup->phy_dev = phydev;



	printk(KERN_INFO "%s: attached PHY driver [%s] "

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

	       dev->name, phydev->drv->name, phydev->dev.bus_id, phydev->irq);

	       "(mii_bus:phy_addr=%s, irq=%d)\n", dev->name,

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



	return 0;

}

drivers/net/bfin_mac.c

+6 −6
Original line number Diff line number Diff line
@@ -415,11 +415,11 @@ static int mii_probe(struct net_device *dev) 
	}



#if defined(CONFIG_BFIN_MAC_RMII)

	phydev = phy_connect(dev, phydev->dev.bus_id, &bfin_mac_adjust_link, 0,

			PHY_INTERFACE_MODE_RMII);

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

			0, PHY_INTERFACE_MODE_RMII);

#else

	phydev = phy_connect(dev, phydev->dev.bus_id, &bfin_mac_adjust_link, 0,

			PHY_INTERFACE_MODE_MII);

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

			0, PHY_INTERFACE_MODE_MII);

#endif



	if (IS_ERR(phydev)) {
@@ -447,7 +447,7 @@ static int mii_probe(struct net_device *dev) 
	printk(KERN_INFO "%s: attached PHY driver [%s] "

	       "(mii_bus:phy_addr=%s, irq=%d, mdc_clk=%dHz(mdc_div=%d)"

	       "@sclk=%dMHz)\n",

	       DRV_NAME, phydev->drv->name, phydev->dev.bus_id, phydev->irq,

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

	       MDC_CLK, mdc_div, sclk/1000000);



	return 0;
@@ -488,7 +488,7 @@ static void bfin_mac_ethtool_getdrvinfo(struct net_device *dev, 
	strcpy(info->driver, DRV_NAME);

	strcpy(info->version, DRV_VERSION);

	strcpy(info->fw_version, "N/A");

	strcpy(info->bus_info, dev->dev.bus_id);

	strcpy(info->bus_info, dev_name(&dev->dev));

}



static struct ethtool_ops bfin_mac_ethtool_ops = {

drivers/net/bmac.c

+1 −1
Original line number Diff line number Diff line
@@ -1240,7 +1240,7 @@ static void bmac_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *inf 
{

	struct bmac_data *bp = netdev_priv(dev);

	strcpy(info->driver, "bmac");

	strcpy(info->bus_info, bp->mdev->ofdev.dev.bus_id);

	strcpy(info->bus_info, dev_name(&bp->mdev->ofdev.dev));

}



static const struct ethtool_ops bmac_ethtool_ops = {

drivers/net/cpmac.c

+1 −1
Original line number Diff line number Diff line
@@ -1161,7 +1161,7 @@ static int __devinit cpmac_probe(struct platform_device *pdev) 
	priv->msg_enable = netif_msg_init(debug_level, 0xff);

	memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr));



	priv->phy = phy_connect(dev, cpmac_mii->phy_map[phy_id]->dev.bus_id,

	priv->phy = phy_connect(dev, dev_name(&cpmac_mii->phy_map[phy_id]->dev),

				&cpmac_adjust_link, 0, PHY_INTERFACE_MODE_MII);

	if (IS_ERR(priv->phy)) {

		if (netif_msg_drv(priv))