diff options
Diffstat (limited to 'drivers/net/arm/etherh.c')
-rw-r--r-- | drivers/net/arm/etherh.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/arm/etherh.c b/drivers/net/arm/etherh.c index e9d15eccad08..5c5f1e470d3c 100644 --- a/drivers/net/arm/etherh.c +++ b/drivers/net/arm/etherh.c | |||
@@ -535,7 +535,7 @@ static int __init etherh_addr(char *addr, struct expansion_card *ec) | |||
535 | 535 | ||
536 | if (!ecard_readchunk(&cd, ec, 0xf5, 0)) { | 536 | if (!ecard_readchunk(&cd, ec, 0xf5, 0)) { |
537 | printk(KERN_ERR "%s: unable to read podule description string\n", | 537 | printk(KERN_ERR "%s: unable to read podule description string\n", |
538 | ec->dev.bus_id); | 538 | dev_name(&ec->dev)); |
539 | goto no_addr; | 539 | goto no_addr; |
540 | } | 540 | } |
541 | 541 | ||
@@ -554,7 +554,7 @@ static int __init etherh_addr(char *addr, struct expansion_card *ec) | |||
554 | } | 554 | } |
555 | 555 | ||
556 | printk(KERN_ERR "%s: unable to parse MAC address: %s\n", | 556 | printk(KERN_ERR "%s: unable to parse MAC address: %s\n", |
557 | ec->dev.bus_id, cd.d.string); | 557 | dev_name(&ec->dev), cd.d.string); |
558 | 558 | ||
559 | no_addr: | 559 | no_addr: |
560 | return -ENODEV; | 560 | return -ENODEV; |
@@ -585,7 +585,7 @@ static void etherh_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *i | |||
585 | { | 585 | { |
586 | strlcpy(info->driver, DRV_NAME, sizeof(info->driver)); | 586 | strlcpy(info->driver, DRV_NAME, sizeof(info->driver)); |
587 | strlcpy(info->version, DRV_VERSION, sizeof(info->version)); | 587 | strlcpy(info->version, DRV_VERSION, sizeof(info->version)); |
588 | strlcpy(info->bus_info, dev->dev.parent->bus_id, | 588 | strlcpy(info->bus_info, dev_name(dev->dev.parent), |
589 | sizeof(info->bus_info)); | 589 | sizeof(info->bus_info)); |
590 | } | 590 | } |
591 | 591 | ||