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

Commit fb28ad35 authored by Kay Sievers's avatar Kay Sievers Committed by David S. Miller
Browse files

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



Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 23779897

drivers/net/3c59x.c

+2 −2
Original line number Diff line number Diff line
@@ -1025,7 +1025,7 @@ static int __devinit vortex_probe1(struct device *gendev, 
		}



		if ((edev = DEVICE_EISA(gendev))) {

			print_name = edev->dev.bus_id;

			print_name = dev_name(&edev->dev);

		}

	}
@@ -2883,7 +2883,7 @@ static void vortex_get_drvinfo(struct net_device *dev, 
		strcpy(info->bus_info, pci_name(VORTEX_PCI(vp)));

	} else {

		if (VORTEX_EISA(vp))

			sprintf(info->bus_info, vp->gendev->bus_id);

			sprintf(info->bus_info, dev_name(vp->gendev));

		else

			sprintf(info->bus_info, "EISA 0x%lx %d",

					dev->base_addr, dev->irq);

drivers/net/defxx.c

+1 −1
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ static int __devinit dfx_register(struct device *bdev) 
	int dfx_bus_pci = DFX_BUS_PCI(bdev);

	int dfx_bus_tc = DFX_BUS_TC(bdev);

	int dfx_use_mmio = DFX_MMIO || dfx_bus_tc;

	char *print_name = bdev->bus_id;

	const char *print_name = dev_name(bdev);

	struct net_device *dev;

	DFX_board_t	  *bp;			/* board pointer */

	resource_size_t bar_start = 0;		/* pointer to port */

drivers/net/enc28j60.c

+1 −1
Original line number Diff line number Diff line
@@ -1448,7 +1448,7 @@ enc28j60_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) 
	strlcpy(info->driver, DRV_NAME, sizeof(info->driver));

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

	strlcpy(info->bus_info,

		dev->dev.parent->bus_id, sizeof(info->bus_info));

		dev_name(dev->dev.parent), sizeof(info->bus_info));

}



static int

drivers/net/fec_mpc52xx.c

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ static int mpc52xx_fec_init_phy(struct net_device *dev) 
	struct phy_device *phydev;

	char phy_id[BUS_ID_SIZE];



	snprintf(phy_id, BUS_ID_SIZE, "%x:%02x",

	snprintf(phy_id, sizeof(phy_id), "%x:%02x",

			(unsigned int)dev->base_addr, priv->phy_addr);



	priv->link = PHY_DOWN;

drivers/net/gianfar.c

+1 −1
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ static int init_phy(struct net_device *dev) 
	priv->oldspeed = 0;

	priv->oldduplex = -1;



	snprintf(phy_id, BUS_ID_SIZE, PHY_ID_FMT, priv->einfo->bus_id, priv->einfo->phy_id);

	snprintf(phy_id, sizeof(phy_id), PHY_ID_FMT, priv->einfo->bus_id, priv->einfo->phy_id);



	interface = gfar_get_interface(dev);