diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/arm/ks8695net.c | 2 | ||||
-rw-r--r-- | drivers/net/au1000_eth.c | 8 | ||||
-rw-r--r-- | drivers/net/bfin_mac.c | 12 | ||||
-rw-r--r-- | drivers/net/bmac.c | 2 | ||||
-rw-r--r-- | drivers/net/cpmac.c | 2 | ||||
-rw-r--r-- | drivers/net/declance.c | 6 | ||||
-rw-r--r-- | drivers/net/depca.c | 6 | ||||
-rw-r--r-- | drivers/net/ehea/ehea_main.c | 2 | ||||
-rw-r--r-- | drivers/net/jazzsonic.c | 6 | ||||
-rw-r--r-- | drivers/net/macb.c | 10 | ||||
-rw-r--r-- | drivers/net/macsonic.c | 15 | ||||
-rw-r--r-- | drivers/net/mipsnet.c | 26 | ||||
-rw-r--r-- | drivers/net/mv643xx_eth.c | 2 | ||||
-rw-r--r-- | drivers/net/sb1250-mac.c | 10 | ||||
-rw-r--r-- | drivers/net/smc911x.c | 2 | ||||
-rw-r--r-- | drivers/net/smc91x.c | 2 | ||||
-rw-r--r-- | drivers/net/smsc911x.c | 7 | ||||
-rw-r--r-- | drivers/net/smsc9420.c | 4 | ||||
-rw-r--r-- | drivers/net/tc35815.c | 4 | ||||
-rw-r--r-- | drivers/net/wimax/i2400m/driver.c | 2 | ||||
-rw-r--r-- | drivers/net/wimax/i2400m/usb-notif.c | 2 | ||||
-rw-r--r-- | drivers/net/xtsonic.c | 2 |
22 files changed, 70 insertions, 64 deletions
diff --git a/drivers/net/arm/ks8695net.c b/drivers/net/arm/ks8695net.c index f3a127434897..35cd264abae7 100644 --- a/drivers/net/arm/ks8695net.c +++ b/drivers/net/arm/ks8695net.c | |||
@@ -1059,7 +1059,7 @@ ks8695_get_drvinfo(struct net_device *ndev, struct ethtool_drvinfo *info) | |||
1059 | { | 1059 | { |
1060 | strlcpy(info->driver, MODULENAME, sizeof(info->driver)); | 1060 | strlcpy(info->driver, MODULENAME, sizeof(info->driver)); |
1061 | strlcpy(info->version, MODULEVERSION, sizeof(info->version)); | 1061 | strlcpy(info->version, MODULEVERSION, sizeof(info->version)); |
1062 | strlcpy(info->bus_info, ndev->dev.parent->bus_id, | 1062 | strlcpy(info->bus_info, dev_name(ndev->dev.parent), |
1063 | sizeof(info->bus_info)); | 1063 | sizeof(info->bus_info)); |
1064 | } | 1064 | } |
1065 | 1065 | ||
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c index 9c875bb3f76c..79aec32c6add 100644 --- a/drivers/net/au1000_eth.c +++ b/drivers/net/au1000_eth.c | |||
@@ -355,8 +355,8 @@ static int mii_probe (struct net_device *dev) | |||
355 | /* now we are supposed to have a proper phydev, to attach to... */ | 355 | /* now we are supposed to have a proper phydev, to attach to... */ |
356 | BUG_ON(phydev->attached_dev); | 356 | BUG_ON(phydev->attached_dev); |
357 | 357 | ||
358 | phydev = phy_connect(dev, phydev->dev.bus_id, &au1000_adjust_link, 0, | 358 | phydev = phy_connect(dev, dev_name(&phydev->dev), &au1000_adjust_link, |
359 | PHY_INTERFACE_MODE_MII); | 359 | 0, PHY_INTERFACE_MODE_MII); |
360 | 360 | ||
361 | if (IS_ERR(phydev)) { | 361 | if (IS_ERR(phydev)) { |
362 | printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name); | 362 | printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name); |
@@ -381,8 +381,8 @@ static int mii_probe (struct net_device *dev) | |||
381 | aup->phy_dev = phydev; | 381 | aup->phy_dev = phydev; |
382 | 382 | ||
383 | printk(KERN_INFO "%s: attached PHY driver [%s] " | 383 | printk(KERN_INFO "%s: attached PHY driver [%s] " |
384 | "(mii_bus:phy_addr=%s, irq=%d)\n", | 384 | "(mii_bus:phy_addr=%s, irq=%d)\n", dev->name, |
385 | dev->name, phydev->drv->name, phydev->dev.bus_id, phydev->irq); | 385 | phydev->drv->name, dev_name(&phydev->dev), phydev->irq); |
386 | 386 | ||
387 | return 0; | 387 | return 0; |
388 | } | 388 | } |
diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c index 78e31aa861e0..9afe8092dfc4 100644 --- a/drivers/net/bfin_mac.c +++ b/drivers/net/bfin_mac.c | |||
@@ -415,11 +415,11 @@ static int mii_probe(struct net_device *dev) | |||
415 | } | 415 | } |
416 | 416 | ||
417 | #if defined(CONFIG_BFIN_MAC_RMII) | 417 | #if defined(CONFIG_BFIN_MAC_RMII) |
418 | phydev = phy_connect(dev, phydev->dev.bus_id, &bfin_mac_adjust_link, 0, | 418 | phydev = phy_connect(dev, dev_name(&phydev->dev), &bfin_mac_adjust_link, |
419 | PHY_INTERFACE_MODE_RMII); | 419 | 0, PHY_INTERFACE_MODE_RMII); |
420 | #else | 420 | #else |
421 | phydev = phy_connect(dev, phydev->dev.bus_id, &bfin_mac_adjust_link, 0, | 421 | phydev = phy_connect(dev, dev_name(&phydev->dev), &bfin_mac_adjust_link, |
422 | PHY_INTERFACE_MODE_MII); | 422 | 0, PHY_INTERFACE_MODE_MII); |
423 | #endif | 423 | #endif |
424 | 424 | ||
425 | if (IS_ERR(phydev)) { | 425 | if (IS_ERR(phydev)) { |
@@ -447,7 +447,7 @@ static int mii_probe(struct net_device *dev) | |||
447 | printk(KERN_INFO "%s: attached PHY driver [%s] " | 447 | printk(KERN_INFO "%s: attached PHY driver [%s] " |
448 | "(mii_bus:phy_addr=%s, irq=%d, mdc_clk=%dHz(mdc_div=%d)" | 448 | "(mii_bus:phy_addr=%s, irq=%d, mdc_clk=%dHz(mdc_div=%d)" |
449 | "@sclk=%dMHz)\n", | 449 | "@sclk=%dMHz)\n", |
450 | DRV_NAME, phydev->drv->name, phydev->dev.bus_id, phydev->irq, | 450 | DRV_NAME, phydev->drv->name, dev_name(&phydev->dev), phydev->irq, |
451 | MDC_CLK, mdc_div, sclk/1000000); | 451 | MDC_CLK, mdc_div, sclk/1000000); |
452 | 452 | ||
453 | return 0; | 453 | return 0; |
@@ -488,7 +488,7 @@ static void bfin_mac_ethtool_getdrvinfo(struct net_device *dev, | |||
488 | strcpy(info->driver, DRV_NAME); | 488 | strcpy(info->driver, DRV_NAME); |
489 | strcpy(info->version, DRV_VERSION); | 489 | strcpy(info->version, DRV_VERSION); |
490 | strcpy(info->fw_version, "N/A"); | 490 | strcpy(info->fw_version, "N/A"); |
491 | strcpy(info->bus_info, dev->dev.bus_id); | 491 | strcpy(info->bus_info, dev_name(&dev->dev)); |
492 | } | 492 | } |
493 | 493 | ||
494 | static struct ethtool_ops bfin_mac_ethtool_ops = { | 494 | static struct ethtool_ops bfin_mac_ethtool_ops = { |
diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c index 8a546a33d581..1ab58375d061 100644 --- a/drivers/net/bmac.c +++ b/drivers/net/bmac.c | |||
@@ -1240,7 +1240,7 @@ static void bmac_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *inf | |||
1240 | { | 1240 | { |
1241 | struct bmac_data *bp = netdev_priv(dev); | 1241 | struct bmac_data *bp = netdev_priv(dev); |
1242 | strcpy(info->driver, "bmac"); | 1242 | strcpy(info->driver, "bmac"); |
1243 | strcpy(info->bus_info, bp->mdev->ofdev.dev.bus_id); | 1243 | strcpy(info->bus_info, dev_name(&bp->mdev->ofdev.dev)); |
1244 | } | 1244 | } |
1245 | 1245 | ||
1246 | static const struct ethtool_ops bmac_ethtool_ops = { | 1246 | static const struct ethtool_ops bmac_ethtool_ops = { |
diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c index f66548751c38..79741c5f9fe7 100644 --- a/drivers/net/cpmac.c +++ b/drivers/net/cpmac.c | |||
@@ -1161,7 +1161,7 @@ static int __devinit cpmac_probe(struct platform_device *pdev) | |||
1161 | priv->msg_enable = netif_msg_init(debug_level, 0xff); | 1161 | priv->msg_enable = netif_msg_init(debug_level, 0xff); |
1162 | memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr)); | 1162 | memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr)); |
1163 | 1163 | ||
1164 | priv->phy = phy_connect(dev, cpmac_mii->phy_map[phy_id]->dev.bus_id, | 1164 | priv->phy = phy_connect(dev, dev_name(&cpmac_mii->phy_map[phy_id]->dev), |
1165 | &cpmac_adjust_link, 0, PHY_INTERFACE_MODE_MII); | 1165 | &cpmac_adjust_link, 0, PHY_INTERFACE_MODE_MII); |
1166 | if (IS_ERR(priv->phy)) { | 1166 | if (IS_ERR(priv->phy)) { |
1167 | if (netif_msg_drv(priv)) | 1167 | if (netif_msg_drv(priv)) |
diff --git a/drivers/net/declance.c b/drivers/net/declance.c index 7ce3053530f9..861c867fca87 100644 --- a/drivers/net/declance.c +++ b/drivers/net/declance.c | |||
@@ -1027,7 +1027,7 @@ static int __init dec_lance_probe(struct device *bdev, const int type) | |||
1027 | printk(version); | 1027 | printk(version); |
1028 | 1028 | ||
1029 | if (bdev) | 1029 | if (bdev) |
1030 | snprintf(name, sizeof(name), "%s", bdev->bus_id); | 1030 | snprintf(name, sizeof(name), "%s", dev_name(bdev)); |
1031 | else { | 1031 | else { |
1032 | i = 0; | 1032 | i = 0; |
1033 | dev = root_lance_dev; | 1033 | dev = root_lance_dev; |
@@ -1105,10 +1105,10 @@ static int __init dec_lance_probe(struct device *bdev, const int type) | |||
1105 | 1105 | ||
1106 | start = to_tc_dev(bdev)->resource.start; | 1106 | start = to_tc_dev(bdev)->resource.start; |
1107 | len = to_tc_dev(bdev)->resource.end - start + 1; | 1107 | len = to_tc_dev(bdev)->resource.end - start + 1; |
1108 | if (!request_mem_region(start, len, bdev->bus_id)) { | 1108 | if (!request_mem_region(start, len, dev_name(bdev))) { |
1109 | printk(KERN_ERR | 1109 | printk(KERN_ERR |
1110 | "%s: Unable to reserve MMIO resource\n", | 1110 | "%s: Unable to reserve MMIO resource\n", |
1111 | bdev->bus_id); | 1111 | dev_name(bdev)); |
1112 | ret = -EBUSY; | 1112 | ret = -EBUSY; |
1113 | goto err_out_dev; | 1113 | goto err_out_dev; |
1114 | } | 1114 | } |
diff --git a/drivers/net/depca.c b/drivers/net/depca.c index e4cef491dc73..55625dbbae5a 100644 --- a/drivers/net/depca.c +++ b/drivers/net/depca.c | |||
@@ -606,8 +606,8 @@ static int __init depca_hw_init (struct net_device *dev, struct device *device) | |||
606 | if (!mem_start || lp->adapter < DEPCA || lp->adapter >=unknown) | 606 | if (!mem_start || lp->adapter < DEPCA || lp->adapter >=unknown) |
607 | return -ENXIO; | 607 | return -ENXIO; |
608 | 608 | ||
609 | printk ("%s: %s at 0x%04lx", | 609 | printk("%s: %s at 0x%04lx", |
610 | device->bus_id, depca_signature[lp->adapter], ioaddr); | 610 | dev_name(device), depca_signature[lp->adapter], ioaddr); |
611 | 611 | ||
612 | switch (lp->depca_bus) { | 612 | switch (lp->depca_bus) { |
613 | #ifdef CONFIG_MCA | 613 | #ifdef CONFIG_MCA |
@@ -669,7 +669,7 @@ static int __init depca_hw_init (struct net_device *dev, struct device *device) | |||
669 | 669 | ||
670 | spin_lock_init(&lp->lock); | 670 | spin_lock_init(&lp->lock); |
671 | sprintf(lp->adapter_name, "%s (%s)", | 671 | sprintf(lp->adapter_name, "%s (%s)", |
672 | depca_signature[lp->adapter], device->bus_id); | 672 | depca_signature[lp->adapter], dev_name(device)); |
673 | status = -EBUSY; | 673 | status = -EBUSY; |
674 | 674 | ||
675 | /* Initialisation Block */ | 675 | /* Initialisation Block */ |
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c index dfe92264e825..8e7c16535ad7 100644 --- a/drivers/net/ehea/ehea_main.c +++ b/drivers/net/ehea/ehea_main.c | |||
@@ -3040,7 +3040,7 @@ static struct device *ehea_register_port(struct ehea_port *port, | |||
3040 | port->ofdev.dev.parent = &port->adapter->ofdev->dev; | 3040 | port->ofdev.dev.parent = &port->adapter->ofdev->dev; |
3041 | port->ofdev.dev.bus = &ibmebus_bus_type; | 3041 | port->ofdev.dev.bus = &ibmebus_bus_type; |
3042 | 3042 | ||
3043 | sprintf(port->ofdev.dev.bus_id, "port%d", port_name_cnt++); | 3043 | dev_set_name(&port->ofdev.dev, "port%d", port_name_cnt++); |
3044 | port->ofdev.dev.release = logical_port_release; | 3044 | port->ofdev.dev.release = logical_port_release; |
3045 | 3045 | ||
3046 | ret = of_device_register(&port->ofdev); | 3046 | ret = of_device_register(&port->ofdev); |
diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c index 334ff9e12cdd..14248cfc3dfd 100644 --- a/drivers/net/jazzsonic.c +++ b/drivers/net/jazzsonic.c | |||
@@ -131,7 +131,8 @@ static int __init sonic_probe1(struct net_device *dev) | |||
131 | if (sonic_debug && version_printed++ == 0) | 131 | if (sonic_debug && version_printed++ == 0) |
132 | printk(version); | 132 | printk(version); |
133 | 133 | ||
134 | printk(KERN_INFO "%s: Sonic ethernet found at 0x%08lx, ", lp->device->bus_id, dev->base_addr); | 134 | printk(KERN_INFO "%s: Sonic ethernet found at 0x%08lx, ", |
135 | dev_name(lp->device), dev->base_addr); | ||
135 | 136 | ||
136 | /* | 137 | /* |
137 | * Put the sonic into software reset, then | 138 | * Put the sonic into software reset, then |
@@ -156,7 +157,8 @@ static int __init sonic_probe1(struct net_device *dev) | |||
156 | if ((lp->descriptors = dma_alloc_coherent(lp->device, | 157 | if ((lp->descriptors = dma_alloc_coherent(lp->device, |
157 | SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode), | 158 | SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode), |
158 | &lp->descriptors_laddr, GFP_KERNEL)) == NULL) { | 159 | &lp->descriptors_laddr, GFP_KERNEL)) == NULL) { |
159 | printk(KERN_ERR "%s: couldn't alloc DMA memory for descriptors.\n", lp->device->bus_id); | 160 | printk(KERN_ERR "%s: couldn't alloc DMA memory for descriptors.\n", |
161 | dev_name(lp->device)); | ||
160 | goto out; | 162 | goto out; |
161 | } | 163 | } |
162 | 164 | ||
diff --git a/drivers/net/macb.c b/drivers/net/macb.c index f6c4936e2fa8..f4086542c358 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c | |||
@@ -211,10 +211,10 @@ static int macb_mii_probe(struct net_device *dev) | |||
211 | 211 | ||
212 | /* attach the mac to the phy */ | 212 | /* attach the mac to the phy */ |
213 | if (pdata && pdata->is_rmii) { | 213 | if (pdata && pdata->is_rmii) { |
214 | phydev = phy_connect(dev, phydev->dev.bus_id, | 214 | phydev = phy_connect(dev, dev_name(&phydev->dev), |
215 | &macb_handle_link_change, 0, PHY_INTERFACE_MODE_RMII); | 215 | &macb_handle_link_change, 0, PHY_INTERFACE_MODE_RMII); |
216 | } else { | 216 | } else { |
217 | phydev = phy_connect(dev, phydev->dev.bus_id, | 217 | phydev = phy_connect(dev, dev_name(&phydev->dev), |
218 | &macb_handle_link_change, 0, PHY_INTERFACE_MODE_MII); | 218 | &macb_handle_link_change, 0, PHY_INTERFACE_MODE_MII); |
219 | } | 219 | } |
220 | 220 | ||
@@ -1077,7 +1077,7 @@ static void macb_get_drvinfo(struct net_device *dev, | |||
1077 | 1077 | ||
1078 | strcpy(info->driver, bp->pdev->dev.driver->name); | 1078 | strcpy(info->driver, bp->pdev->dev.driver->name); |
1079 | strcpy(info->version, "$Revision: 1.14 $"); | 1079 | strcpy(info->version, "$Revision: 1.14 $"); |
1080 | strcpy(info->bus_info, bp->pdev->dev.bus_id); | 1080 | strcpy(info->bus_info, dev_name(&bp->pdev->dev)); |
1081 | } | 1081 | } |
1082 | 1082 | ||
1083 | static struct ethtool_ops macb_ethtool_ops = { | 1083 | static struct ethtool_ops macb_ethtool_ops = { |
@@ -1234,8 +1234,8 @@ static int __init macb_probe(struct platform_device *pdev) | |||
1234 | 1234 | ||
1235 | phydev = bp->phy_dev; | 1235 | phydev = bp->phy_dev; |
1236 | printk(KERN_INFO "%s: attached PHY driver [%s] " | 1236 | printk(KERN_INFO "%s: attached PHY driver [%s] " |
1237 | "(mii_bus:phy_addr=%s, irq=%d)\n", | 1237 | "(mii_bus:phy_addr=%s, irq=%d)\n", dev->name, |
1238 | dev->name, phydev->drv->name, phydev->dev.bus_id, phydev->irq); | 1238 | phydev->drv->name, dev_name(&phydev->dev), phydev->irq); |
1239 | 1239 | ||
1240 | return 0; | 1240 | return 0; |
1241 | 1241 | ||
diff --git a/drivers/net/macsonic.c b/drivers/net/macsonic.c index 205bb05c25d6..527166e35d56 100644 --- a/drivers/net/macsonic.c +++ b/drivers/net/macsonic.c | |||
@@ -176,7 +176,8 @@ static int __init macsonic_init(struct net_device *dev) | |||
176 | if ((lp->descriptors = dma_alloc_coherent(lp->device, | 176 | if ((lp->descriptors = dma_alloc_coherent(lp->device, |
177 | SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode), | 177 | SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode), |
178 | &lp->descriptors_laddr, GFP_KERNEL)) == NULL) { | 178 | &lp->descriptors_laddr, GFP_KERNEL)) == NULL) { |
179 | printk(KERN_ERR "%s: couldn't alloc DMA memory for descriptors.\n", lp->device->bus_id); | 179 | printk(KERN_ERR "%s: couldn't alloc DMA memory for descriptors.\n", |
180 | dev_name(lp->device)); | ||
180 | return -ENOMEM; | 181 | return -ENOMEM; |
181 | } | 182 | } |
182 | 183 | ||
@@ -337,7 +338,7 @@ static int __init mac_onboard_sonic_probe(struct net_device *dev) | |||
337 | sonic_version_printed = 1; | 338 | sonic_version_printed = 1; |
338 | } | 339 | } |
339 | printk(KERN_INFO "%s: onboard / comm-slot SONIC at 0x%08lx\n", | 340 | printk(KERN_INFO "%s: onboard / comm-slot SONIC at 0x%08lx\n", |
340 | lp->device->bus_id, dev->base_addr); | 341 | dev_name(lp->device), dev->base_addr); |
341 | 342 | ||
342 | /* The PowerBook's SONIC is 16 bit always. */ | 343 | /* The PowerBook's SONIC is 16 bit always. */ |
343 | if (macintosh_config->ident == MAC_MODEL_PB520) { | 344 | if (macintosh_config->ident == MAC_MODEL_PB520) { |
@@ -370,10 +371,10 @@ static int __init mac_onboard_sonic_probe(struct net_device *dev) | |||
370 | } | 371 | } |
371 | printk(KERN_INFO | 372 | printk(KERN_INFO |
372 | "%s: revision 0x%04x, using %d bit DMA and register offset %d\n", | 373 | "%s: revision 0x%04x, using %d bit DMA and register offset %d\n", |
373 | lp->device->bus_id, sr, lp->dma_bitmode?32:16, lp->reg_offset); | 374 | dev_name(lp->device), sr, lp->dma_bitmode?32:16, lp->reg_offset); |
374 | 375 | ||
375 | #if 0 /* This is sometimes useful to find out how MacOS configured the card. */ | 376 | #if 0 /* This is sometimes useful to find out how MacOS configured the card. */ |
376 | printk(KERN_INFO "%s: DCR: 0x%04x, DCR2: 0x%04x\n", lp->device->bus_id, | 377 | printk(KERN_INFO "%s: DCR: 0x%04x, DCR2: 0x%04x\n", dev_name(lp->device), |
377 | SONIC_READ(SONIC_DCR) & 0xffff, SONIC_READ(SONIC_DCR2) & 0xffff); | 378 | SONIC_READ(SONIC_DCR) & 0xffff, SONIC_READ(SONIC_DCR2) & 0xffff); |
378 | #endif | 379 | #endif |
379 | 380 | ||
@@ -525,12 +526,12 @@ static int __init mac_nubus_sonic_probe(struct net_device *dev) | |||
525 | sonic_version_printed = 1; | 526 | sonic_version_printed = 1; |
526 | } | 527 | } |
527 | printk(KERN_INFO "%s: %s in slot %X\n", | 528 | printk(KERN_INFO "%s: %s in slot %X\n", |
528 | lp->device->bus_id, ndev->board->name, ndev->board->slot); | 529 | dev_name(lp->device), ndev->board->name, ndev->board->slot); |
529 | printk(KERN_INFO "%s: revision 0x%04x, using %d bit DMA and register offset %d\n", | 530 | printk(KERN_INFO "%s: revision 0x%04x, using %d bit DMA and register offset %d\n", |
530 | lp->device->bus_id, SONIC_READ(SONIC_SR), dma_bitmode?32:16, reg_offset); | 531 | dev_name(lp->device), SONIC_READ(SONIC_SR), dma_bitmode?32:16, reg_offset); |
531 | 532 | ||
532 | #if 0 /* This is sometimes useful to find out how MacOS configured the card. */ | 533 | #if 0 /* This is sometimes useful to find out how MacOS configured the card. */ |
533 | printk(KERN_INFO "%s: DCR: 0x%04x, DCR2: 0x%04x\n", lp->device->bus_id, | 534 | printk(KERN_INFO "%s: DCR: 0x%04x, DCR2: 0x%04x\n", dev_name(lp->device), |
534 | SONIC_READ(SONIC_DCR) & 0xffff, SONIC_READ(SONIC_DCR2) & 0xffff); | 535 | SONIC_READ(SONIC_DCR) & 0xffff, SONIC_READ(SONIC_DCR2) & 0xffff); |
535 | #endif | 536 | #endif |
536 | 537 | ||
diff --git a/drivers/net/mipsnet.c b/drivers/net/mipsnet.c index 4e7a5faf0351..664835b822fb 100644 --- a/drivers/net/mipsnet.c +++ b/drivers/net/mipsnet.c | |||
@@ -237,7 +237,7 @@ static void mipsnet_set_mclist(struct net_device *dev) | |||
237 | { | 237 | { |
238 | } | 238 | } |
239 | 239 | ||
240 | static int __init mipsnet_probe(struct device *dev) | 240 | static int __init mipsnet_probe(struct platform_device *dev) |
241 | { | 241 | { |
242 | struct net_device *netdev; | 242 | struct net_device *netdev; |
243 | int err; | 243 | int err; |
@@ -248,7 +248,7 @@ static int __init mipsnet_probe(struct device *dev) | |||
248 | goto out; | 248 | goto out; |
249 | } | 249 | } |
250 | 250 | ||
251 | dev_set_drvdata(dev, netdev); | 251 | platform_set_drvdata(dev, netdev); |
252 | 252 | ||
253 | netdev->open = mipsnet_open; | 253 | netdev->open = mipsnet_open; |
254 | netdev->stop = mipsnet_close; | 254 | netdev->stop = mipsnet_close; |
@@ -293,23 +293,25 @@ out: | |||
293 | return err; | 293 | return err; |
294 | } | 294 | } |
295 | 295 | ||
296 | static int __devexit mipsnet_device_remove(struct device *device) | 296 | static int __devexit mipsnet_device_remove(struct platform_device *device) |
297 | { | 297 | { |
298 | struct net_device *dev = dev_get_drvdata(device); | 298 | struct net_device *dev = platform_get_drvdata(device); |
299 | 299 | ||
300 | unregister_netdev(dev); | 300 | unregister_netdev(dev); |
301 | release_region(dev->base_addr, sizeof(struct mipsnet_regs)); | 301 | release_region(dev->base_addr, sizeof(struct mipsnet_regs)); |
302 | free_netdev(dev); | 302 | free_netdev(dev); |
303 | dev_set_drvdata(device, NULL); | 303 | platform_set_drvdata(device, NULL); |
304 | 304 | ||
305 | return 0; | 305 | return 0; |
306 | } | 306 | } |
307 | 307 | ||
308 | static struct device_driver mipsnet_driver = { | 308 | static struct platform_driver mipsnet_driver = { |
309 | .name = mipsnet_string, | 309 | .driver = { |
310 | .bus = &platform_bus_type, | 310 | .name = mipsnet_string, |
311 | .probe = mipsnet_probe, | 311 | .owner = THIS_MODULE, |
312 | .remove = __devexit_p(mipsnet_device_remove), | 312 | }, |
313 | .probe = mipsnet_probe, | ||
314 | .remove = __devexit_p(mipsnet_device_remove), | ||
313 | }; | 315 | }; |
314 | 316 | ||
315 | static int __init mipsnet_init_module(void) | 317 | static int __init mipsnet_init_module(void) |
@@ -319,7 +321,7 @@ static int __init mipsnet_init_module(void) | |||
319 | printk(KERN_INFO "MIPSNet Ethernet driver. Version: %s. " | 321 | printk(KERN_INFO "MIPSNet Ethernet driver. Version: %s. " |
320 | "(c)2005 MIPS Technologies, Inc.\n", MIPSNET_VERSION); | 322 | "(c)2005 MIPS Technologies, Inc.\n", MIPSNET_VERSION); |
321 | 323 | ||
322 | err = driver_register(&mipsnet_driver); | 324 | err = platform_driver_register(&mipsnet_driver); |
323 | if (err) | 325 | if (err) |
324 | printk(KERN_ERR "Driver registration failed\n"); | 326 | printk(KERN_ERR "Driver registration failed\n"); |
325 | 327 | ||
@@ -328,7 +330,7 @@ static int __init mipsnet_init_module(void) | |||
328 | 330 | ||
329 | static void __exit mipsnet_exit_module(void) | 331 | static void __exit mipsnet_exit_module(void) |
330 | { | 332 | { |
331 | driver_unregister(&mipsnet_driver); | 333 | platform_driver_unregister(&mipsnet_driver); |
332 | } | 334 | } |
333 | 335 | ||
334 | module_init(mipsnet_init_module); | 336 | module_init(mipsnet_init_module); |
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index b0bc3bc18e9c..fe4e158c893d 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c | |||
@@ -2588,7 +2588,7 @@ static void phy_init(struct mv643xx_eth_private *mp, int speed, int duplex) | |||
2588 | 2588 | ||
2589 | phy_reset(mp); | 2589 | phy_reset(mp); |
2590 | 2590 | ||
2591 | phy_attach(mp->dev, phy->dev.bus_id, 0, PHY_INTERFACE_MODE_GMII); | 2591 | phy_attach(mp->dev, dev_name(&phy->dev), 0, PHY_INTERFACE_MODE_GMII); |
2592 | 2592 | ||
2593 | if (speed == 0) { | 2593 | if (speed == 0) { |
2594 | phy->autoneg = AUTONEG_ENABLE; | 2594 | phy->autoneg = AUTONEG_ENABLE; |
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c index 31e38fae017f..845431c186ac 100644 --- a/drivers/net/sb1250-mac.c +++ b/drivers/net/sb1250-mac.c | |||
@@ -2478,7 +2478,7 @@ static int sbmac_mii_probe(struct net_device *dev) | |||
2478 | return -ENXIO; | 2478 | return -ENXIO; |
2479 | } | 2479 | } |
2480 | 2480 | ||
2481 | phy_dev = phy_connect(dev, phy_dev->dev.bus_id, &sbmac_mii_poll, 0, | 2481 | phy_dev = phy_connect(dev, dev_name(&phy_dev->dev), &sbmac_mii_poll, 0, |
2482 | PHY_INTERFACE_MODE_GMII); | 2482 | PHY_INTERFACE_MODE_GMII); |
2483 | if (IS_ERR(phy_dev)) { | 2483 | if (IS_ERR(phy_dev)) { |
2484 | printk(KERN_ERR "%s: could not attach to PHY\n", dev->name); | 2484 | printk(KERN_ERR "%s: could not attach to PHY\n", dev->name); |
@@ -2500,7 +2500,7 @@ static int sbmac_mii_probe(struct net_device *dev) | |||
2500 | 2500 | ||
2501 | pr_info("%s: attached PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n", | 2501 | pr_info("%s: attached PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n", |
2502 | dev->name, phy_dev->drv->name, | 2502 | dev->name, phy_dev->drv->name, |
2503 | phy_dev->dev.bus_id, phy_dev->irq); | 2503 | dev_name(&phy_dev->dev), phy_dev->irq); |
2504 | 2504 | ||
2505 | sc->phy_dev = phy_dev; | 2505 | sc->phy_dev = phy_dev; |
2506 | 2506 | ||
@@ -2697,7 +2697,7 @@ static int __init sbmac_probe(struct platform_device *pldev) | |||
2697 | sbm_base = ioremap_nocache(res->start, res->end - res->start + 1); | 2697 | sbm_base = ioremap_nocache(res->start, res->end - res->start + 1); |
2698 | if (!sbm_base) { | 2698 | if (!sbm_base) { |
2699 | printk(KERN_ERR "%s: unable to map device registers\n", | 2699 | printk(KERN_ERR "%s: unable to map device registers\n", |
2700 | pldev->dev.bus_id); | 2700 | dev_name(&pldev->dev)); |
2701 | err = -ENOMEM; | 2701 | err = -ENOMEM; |
2702 | goto out_out; | 2702 | goto out_out; |
2703 | } | 2703 | } |
@@ -2708,7 +2708,7 @@ static int __init sbmac_probe(struct platform_device *pldev) | |||
2708 | * If we find a zero, skip this MAC. | 2708 | * If we find a zero, skip this MAC. |
2709 | */ | 2709 | */ |
2710 | sbmac_orig_hwaddr = __raw_readq(sbm_base + R_MAC_ETHERNET_ADDR); | 2710 | sbmac_orig_hwaddr = __raw_readq(sbm_base + R_MAC_ETHERNET_ADDR); |
2711 | pr_debug("%s: %sconfiguring MAC at 0x%08Lx\n", pldev->dev.bus_id, | 2711 | pr_debug("%s: %sconfiguring MAC at 0x%08Lx\n", dev_name(&pldev->dev), |
2712 | sbmac_orig_hwaddr ? "" : "not ", (long long)res->start); | 2712 | sbmac_orig_hwaddr ? "" : "not ", (long long)res->start); |
2713 | if (sbmac_orig_hwaddr == 0) { | 2713 | if (sbmac_orig_hwaddr == 0) { |
2714 | err = 0; | 2714 | err = 0; |
@@ -2721,7 +2721,7 @@ static int __init sbmac_probe(struct platform_device *pldev) | |||
2721 | dev = alloc_etherdev(sizeof(struct sbmac_softc)); | 2721 | dev = alloc_etherdev(sizeof(struct sbmac_softc)); |
2722 | if (!dev) { | 2722 | if (!dev) { |
2723 | printk(KERN_ERR "%s: unable to allocate etherdev\n", | 2723 | printk(KERN_ERR "%s: unable to allocate etherdev\n", |
2724 | pldev->dev.bus_id); | 2724 | dev_name(&pldev->dev)); |
2725 | err = -ENOMEM; | 2725 | err = -ENOMEM; |
2726 | goto out_unmap; | 2726 | goto out_unmap; |
2727 | } | 2727 | } |
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index 223cde0d43be..293610334a77 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c | |||
@@ -1545,7 +1545,7 @@ smc911x_ethtool_getdrvinfo(struct net_device *dev, struct ethtool_drvinfo *info) | |||
1545 | { | 1545 | { |
1546 | strncpy(info->driver, CARDNAME, sizeof(info->driver)); | 1546 | strncpy(info->driver, CARDNAME, sizeof(info->driver)); |
1547 | strncpy(info->version, version, sizeof(info->version)); | 1547 | strncpy(info->version, version, sizeof(info->version)); |
1548 | strncpy(info->bus_info, dev->dev.parent->bus_id, sizeof(info->bus_info)); | 1548 | strncpy(info->bus_info, dev_name(dev->dev.parent), sizeof(info->bus_info)); |
1549 | } | 1549 | } |
1550 | 1550 | ||
1551 | static int smc911x_ethtool_nwayreset(struct net_device *dev) | 1551 | static int smc911x_ethtool_nwayreset(struct net_device *dev) |
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c index b215a8d85e62..0b6da9501444 100644 --- a/drivers/net/smc91x.c +++ b/drivers/net/smc91x.c | |||
@@ -1614,7 +1614,7 @@ smc_ethtool_getdrvinfo(struct net_device *dev, struct ethtool_drvinfo *info) | |||
1614 | { | 1614 | { |
1615 | strncpy(info->driver, CARDNAME, sizeof(info->driver)); | 1615 | strncpy(info->driver, CARDNAME, sizeof(info->driver)); |
1616 | strncpy(info->version, version, sizeof(info->version)); | 1616 | strncpy(info->version, version, sizeof(info->version)); |
1617 | strncpy(info->bus_info, dev->dev.parent->bus_id, sizeof(info->bus_info)); | 1617 | strncpy(info->bus_info, dev_name(dev->dev.parent), sizeof(info->bus_info)); |
1618 | } | 1618 | } |
1619 | 1619 | ||
1620 | static int smc_ethtool_nwayreset(struct net_device *dev) | 1620 | static int smc_ethtool_nwayreset(struct net_device *dev) |
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c index d1590ac55e4b..ab18ee0f60f3 100644 --- a/drivers/net/smsc911x.c +++ b/drivers/net/smsc911x.c | |||
@@ -769,7 +769,7 @@ static int smsc911x_mii_probe(struct net_device *dev) | |||
769 | return -ENODEV; | 769 | return -ENODEV; |
770 | } | 770 | } |
771 | 771 | ||
772 | phydev = phy_connect(dev, phydev->dev.bus_id, | 772 | phydev = phy_connect(dev, dev_name(&phydev->dev), |
773 | &smsc911x_phy_adjust_link, 0, pdata->config.phy_interface); | 773 | &smsc911x_phy_adjust_link, 0, pdata->config.phy_interface); |
774 | 774 | ||
775 | if (IS_ERR(phydev)) { | 775 | if (IS_ERR(phydev)) { |
@@ -778,7 +778,8 @@ static int smsc911x_mii_probe(struct net_device *dev) | |||
778 | } | 778 | } |
779 | 779 | ||
780 | pr_info("%s: attached PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n", | 780 | pr_info("%s: attached PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n", |
781 | dev->name, phydev->drv->name, phydev->dev.bus_id, phydev->irq); | 781 | dev->name, phydev->drv->name, |
782 | dev_name(&phydev->dev), phydev->irq); | ||
782 | 783 | ||
783 | /* mask with MAC supported features */ | 784 | /* mask with MAC supported features */ |
784 | phydev->supported &= (PHY_BASIC_FEATURES | SUPPORTED_Pause | | 785 | phydev->supported &= (PHY_BASIC_FEATURES | SUPPORTED_Pause | |
@@ -1549,7 +1550,7 @@ static void smsc911x_ethtool_getdrvinfo(struct net_device *dev, | |||
1549 | { | 1550 | { |
1550 | strlcpy(info->driver, SMSC_CHIPNAME, sizeof(info->driver)); | 1551 | strlcpy(info->driver, SMSC_CHIPNAME, sizeof(info->driver)); |
1551 | strlcpy(info->version, SMSC_DRV_VERSION, sizeof(info->version)); | 1552 | strlcpy(info->version, SMSC_DRV_VERSION, sizeof(info->version)); |
1552 | strlcpy(info->bus_info, dev->dev.parent->bus_id, | 1553 | strlcpy(info->bus_info, dev_name(dev->dev.parent), |
1553 | sizeof(info->bus_info)); | 1554 | sizeof(info->bus_info)); |
1554 | } | 1555 | } |
1555 | 1556 | ||
diff --git a/drivers/net/smsc9420.c b/drivers/net/smsc9420.c index 4e15ae068b3f..72f1348eb809 100644 --- a/drivers/net/smsc9420.c +++ b/drivers/net/smsc9420.c | |||
@@ -1160,7 +1160,7 @@ static int smsc9420_mii_probe(struct net_device *dev) | |||
1160 | smsc_info(PROBE, "PHY addr %d, phy_id 0x%08X", phydev->addr, | 1160 | smsc_info(PROBE, "PHY addr %d, phy_id 0x%08X", phydev->addr, |
1161 | phydev->phy_id); | 1161 | phydev->phy_id); |
1162 | 1162 | ||
1163 | phydev = phy_connect(dev, phydev->dev.bus_id, | 1163 | phydev = phy_connect(dev, dev_name(&phydev->dev), |
1164 | &smsc9420_phy_adjust_link, 0, PHY_INTERFACE_MODE_MII); | 1164 | &smsc9420_phy_adjust_link, 0, PHY_INTERFACE_MODE_MII); |
1165 | 1165 | ||
1166 | if (IS_ERR(phydev)) { | 1166 | if (IS_ERR(phydev)) { |
@@ -1169,7 +1169,7 @@ static int smsc9420_mii_probe(struct net_device *dev) | |||
1169 | } | 1169 | } |
1170 | 1170 | ||
1171 | pr_info("%s: attached PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n", | 1171 | pr_info("%s: attached PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n", |
1172 | dev->name, phydev->drv->name, phydev->dev.bus_id, phydev->irq); | 1172 | dev->name, phydev->drv->name, dev_name(&phydev->dev), phydev->irq); |
1173 | 1173 | ||
1174 | /* mask with MAC supported features */ | 1174 | /* mask with MAC supported features */ |
1175 | phydev->supported &= (PHY_BASIC_FEATURES | SUPPORTED_Pause | | 1175 | phydev->supported &= (PHY_BASIC_FEATURES | SUPPORTED_Pause | |
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c index bcd0e60cbda9..e1f8eb96a45c 100644 --- a/drivers/net/tc35815.c +++ b/drivers/net/tc35815.c | |||
@@ -725,7 +725,7 @@ static int tc_mii_probe(struct net_device *dev) | |||
725 | } | 725 | } |
726 | 726 | ||
727 | /* attach the mac to the phy */ | 727 | /* attach the mac to the phy */ |
728 | phydev = phy_connect(dev, phydev->dev.bus_id, | 728 | phydev = phy_connect(dev, dev_name(&phydev->dev), |
729 | &tc_handle_link_change, 0, | 729 | &tc_handle_link_change, 0, |
730 | lp->chiptype == TC35815_TX4939 ? | 730 | lp->chiptype == TC35815_TX4939 ? |
731 | PHY_INTERFACE_MODE_RMII : PHY_INTERFACE_MODE_MII); | 731 | PHY_INTERFACE_MODE_RMII : PHY_INTERFACE_MODE_MII); |
@@ -735,7 +735,7 @@ static int tc_mii_probe(struct net_device *dev) | |||
735 | } | 735 | } |
736 | printk(KERN_INFO "%s: attached PHY driver [%s] " | 736 | printk(KERN_INFO "%s: attached PHY driver [%s] " |
737 | "(mii_bus:phy_addr=%s, id=%x)\n", | 737 | "(mii_bus:phy_addr=%s, id=%x)\n", |
738 | dev->name, phydev->drv->name, phydev->dev.bus_id, | 738 | dev->name, phydev->drv->name, dev_name(&phydev->dev), |
739 | phydev->phy_id); | 739 | phydev->phy_id); |
740 | 740 | ||
741 | /* mask with MAC supported features */ | 741 | /* mask with MAC supported features */ |
diff --git a/drivers/net/wimax/i2400m/driver.c b/drivers/net/wimax/i2400m/driver.c index e80a0b65a754..d58b971faa64 100644 --- a/drivers/net/wimax/i2400m/driver.c +++ b/drivers/net/wimax/i2400m/driver.c | |||
@@ -613,7 +613,7 @@ int i2400m_setup(struct i2400m *i2400m, enum i2400m_bri bm_flags) | |||
613 | d_fnstart(3, dev, "(i2400m %p)\n", i2400m); | 613 | d_fnstart(3, dev, "(i2400m %p)\n", i2400m); |
614 | 614 | ||
615 | snprintf(wimax_dev->name, sizeof(wimax_dev->name), | 615 | snprintf(wimax_dev->name, sizeof(wimax_dev->name), |
616 | "i2400m-%s:%s", dev->bus->name, dev->bus_id); | 616 | "i2400m-%s:%s", dev->bus->name, dev_name(dev)); |
617 | 617 | ||
618 | i2400m->bm_cmd_buf = kzalloc(I2400M_BM_CMD_BUF_SIZE, GFP_KERNEL); | 618 | i2400m->bm_cmd_buf = kzalloc(I2400M_BM_CMD_BUF_SIZE, GFP_KERNEL); |
619 | if (i2400m->bm_cmd_buf == NULL) { | 619 | if (i2400m->bm_cmd_buf == NULL) { |
diff --git a/drivers/net/wimax/i2400m/usb-notif.c b/drivers/net/wimax/i2400m/usb-notif.c index 9702c22b2497..0528879f6d39 100644 --- a/drivers/net/wimax/i2400m/usb-notif.c +++ b/drivers/net/wimax/i2400m/usb-notif.c | |||
@@ -102,7 +102,7 @@ int i2400mu_notification_grok(struct i2400mu *i2400mu, const void *buf, | |||
102 | dev_err(dev, "HW BUG? Unknown/unexpected data in notification " | 102 | dev_err(dev, "HW BUG? Unknown/unexpected data in notification " |
103 | "message (%zu bytes)\n", buf_len); | 103 | "message (%zu bytes)\n", buf_len); |
104 | snprintf(prefix, sizeof(prefix), "%s %s: ", | 104 | snprintf(prefix, sizeof(prefix), "%s %s: ", |
105 | dev_driver_string(dev) , dev->bus_id); | 105 | dev_driver_string(dev) , dev_name(dev)); |
106 | if (buf_len > 64) { | 106 | if (buf_len > 64) { |
107 | print_hex_dump(KERN_ERR, prefix, DUMP_PREFIX_OFFSET, | 107 | print_hex_dump(KERN_ERR, prefix, DUMP_PREFIX_OFFSET, |
108 | 8, 4, buf, 64, 0); | 108 | 8, 4, buf, 64, 0); |
diff --git a/drivers/net/xtsonic.c b/drivers/net/xtsonic.c index 03a3f34e9039..a12a7211c982 100644 --- a/drivers/net/xtsonic.c +++ b/drivers/net/xtsonic.c | |||
@@ -183,7 +183,7 @@ static int __init sonic_probe1(struct net_device *dev) | |||
183 | 183 | ||
184 | if (lp->descriptors == NULL) { | 184 | if (lp->descriptors == NULL) { |
185 | printk(KERN_ERR "%s: couldn't alloc DMA memory for " | 185 | printk(KERN_ERR "%s: couldn't alloc DMA memory for " |
186 | " descriptors.\n", lp->device->bus_id); | 186 | " descriptors.\n", dev_name(lp->device)); |
187 | goto out; | 187 | goto out; |
188 | } | 188 | } |
189 | 189 | ||