diff options
Diffstat (limited to 'drivers/net/tokenring/madgemc.c')
-rw-r--r-- | drivers/net/tokenring/madgemc.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c index c9c5a2b1ed9e..0ba6f0bc7c00 100644 --- a/drivers/net/tokenring/madgemc.c +++ b/drivers/net/tokenring/madgemc.c | |||
@@ -152,7 +152,6 @@ static int __devinit madgemc_probe(struct device *device) | |||
152 | struct card_info *card; | 152 | struct card_info *card; |
153 | struct mca_device *mdev = to_mca_device(device); | 153 | struct mca_device *mdev = to_mca_device(device); |
154 | int ret = 0; | 154 | int ret = 0; |
155 | DECLARE_MAC_BUF(mac); | ||
156 | 155 | ||
157 | if (versionprinted++ == 0) | 156 | if (versionprinted++ == 0) |
158 | printk("%s", version); | 157 | printk("%s", version); |
@@ -323,8 +322,8 @@ static int __devinit madgemc_probe(struct device *device) | |||
323 | mca_device_set_name(mdev, (card->cardtype == 0x08)?MADGEMC16_CARDNAME:MADGEMC32_CARDNAME); | 322 | mca_device_set_name(mdev, (card->cardtype == 0x08)?MADGEMC16_CARDNAME:MADGEMC32_CARDNAME); |
324 | mca_set_adapter_procfn(mdev->slot, madgemc_mcaproc, dev); | 323 | mca_set_adapter_procfn(mdev->slot, madgemc_mcaproc, dev); |
325 | 324 | ||
326 | printk("%s: Ring Station Address: %s\n", | 325 | printk("%s: Ring Station Address: %pM\n", |
327 | dev->name, print_mac(mac, dev->dev_addr)); | 326 | dev->name, dev->dev_addr); |
328 | 327 | ||
329 | if (tmsdev_init(dev, device)) { | 328 | if (tmsdev_init(dev, device)) { |
330 | printk("%s: unable to get memory for dev->priv.\n", | 329 | printk("%s: unable to get memory for dev->priv.\n", |
@@ -690,7 +689,6 @@ static int madgemc_mcaproc(char *buf, int slot, void *d) | |||
690 | struct net_local *tp = netdev_priv(dev); | 689 | struct net_local *tp = netdev_priv(dev); |
691 | struct card_info *curcard = tp->tmspriv; | 690 | struct card_info *curcard = tp->tmspriv; |
692 | int len = 0; | 691 | int len = 0; |
693 | DECLARE_MAC_BUF(mac); | ||
694 | 692 | ||
695 | len += sprintf(buf+len, "-------\n"); | 693 | len += sprintf(buf+len, "-------\n"); |
696 | if (curcard) { | 694 | if (curcard) { |
@@ -714,8 +712,8 @@ static int madgemc_mcaproc(char *buf, int slot, void *d) | |||
714 | } | 712 | } |
715 | len += sprintf(buf+len, " (%s)\n", (curcard->fairness)?"Unfair":"Fair"); | 713 | len += sprintf(buf+len, " (%s)\n", (curcard->fairness)?"Unfair":"Fair"); |
716 | 714 | ||
717 | len += sprintf(buf+len, "Ring Station Address: %s\n", | 715 | len += sprintf(buf+len, "Ring Station Address: %pM\n", |
718 | print_mac(mac, dev->dev_addr)); | 716 | dev->dev_addr); |
719 | } else | 717 | } else |
720 | len += sprintf(buf+len, "Card not configured\n"); | 718 | len += sprintf(buf+len, "Card not configured\n"); |
721 | 719 | ||