diff options
Diffstat (limited to 'drivers/net/myri_sbus.c')
-rw-r--r-- | drivers/net/myri_sbus.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c index 3ad7589d6a1c..1bbdde199220 100644 --- a/drivers/net/myri_sbus.c +++ b/drivers/net/myri_sbus.c | |||
@@ -318,13 +318,10 @@ static void myri_is_not_so_happy(struct myri_eth *mp) | |||
318 | #ifdef DEBUG_HEADER | 318 | #ifdef DEBUG_HEADER |
319 | static void dump_ehdr(struct ethhdr *ehdr) | 319 | static void dump_ehdr(struct ethhdr *ehdr) |
320 | { | 320 | { |
321 | DECLARE_MAC_BUF(mac); | 321 | printk("ehdr[h_dst(%pM)" |
322 | DECLARE_MAC_BUF(mac2); | 322 | "h_source(%pM)" |
323 | printk("ehdr[h_dst(%s)" | ||
324 | "h_source(%s)" | ||
325 | "h_proto(%04x)]\n", | 323 | "h_proto(%04x)]\n", |
326 | print_mac(mac, ehdr->h_dest), print_mac(mac2, ehdr->h_source), | 324 | ehdr->h_dest, ehdr->h_source, ehdr->h_proto); |
327 | ehdr->h_proto); | ||
328 | } | 325 | } |
329 | 326 | ||
330 | static void dump_ehdr_and_myripad(unsigned char *stuff) | 327 | static void dump_ehdr_and_myripad(unsigned char *stuff) |
@@ -905,7 +902,6 @@ static int __devinit myri_sbus_probe(struct of_device *op, const struct of_devic | |||
905 | struct device_node *dp = op->node; | 902 | struct device_node *dp = op->node; |
906 | static unsigned version_printed; | 903 | static unsigned version_printed; |
907 | struct net_device *dev; | 904 | struct net_device *dev; |
908 | DECLARE_MAC_BUF(mac); | ||
909 | struct myri_eth *mp; | 905 | struct myri_eth *mp; |
910 | const void *prop; | 906 | const void *prop; |
911 | static int num; | 907 | static int num; |
@@ -1088,8 +1084,8 @@ static int __devinit myri_sbus_probe(struct of_device *op, const struct of_devic | |||
1088 | 1084 | ||
1089 | num++; | 1085 | num++; |
1090 | 1086 | ||
1091 | printk("%s: MyriCOM MyriNET Ethernet %s\n", | 1087 | printk("%s: MyriCOM MyriNET Ethernet %pM\n", |
1092 | dev->name, print_mac(mac, dev->dev_addr)); | 1088 | dev->name, dev->dev_addr); |
1093 | 1089 | ||
1094 | return 0; | 1090 | return 0; |
1095 | 1091 | ||