aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/atm
diff options
context:
space:
mode:
authorhartleys <hartleys@visionengravers.com>2010-01-05 01:22:20 -0500
committerDavid S. Miller <davem@davemloft.net>2010-01-07 04:13:57 -0500
commit3008ab36e23623cbe7a53bff2d495eca5426a9ce (patch)
tree5bc2785b48d7d0eb068906bad471d5fe394a6a02 /drivers/atm
parent2c35294853b2e977bdfc9e401b7b6d881fcaa69b (diff)
drivers/atm/fore200e.c: use %pM to show MAC address
Use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: David S. Miller <davem@davemloft.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/atm')
-rw-r--r--drivers/atm/fore200e.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index bc53fed89b1e..f7d6ebaa0418 100644
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -2064,12 +2064,10 @@ fore200e_get_esi(struct fore200e* fore200e)
2064 return -EBUSY; 2064 return -EBUSY;
2065 } 2065 }
2066 2066
2067 printk(FORE200E "device %s, rev. %c, S/N: %d, ESI: %02x:%02x:%02x:%02x:%02x:%02x\n", 2067 printk(FORE200E "device %s, rev. %c, S/N: %d, ESI: %pM\n",
2068 fore200e->name, 2068 fore200e->name,
2069 (prom->hw_revision & 0xFF) + '@', /* probably meaningless with SBA boards */ 2069 (prom->hw_revision & 0xFF) + '@', /* probably meaningless with SBA boards */
2070 prom->serial_number & 0xFFFF, 2070 prom->serial_number & 0xFFFF, &prom->mac_addr[2]);
2071 prom->mac_addr[ 2 ], prom->mac_addr[ 3 ], prom->mac_addr[ 4 ],
2072 prom->mac_addr[ 5 ], prom->mac_addr[ 6 ], prom->mac_addr[ 7 ]);
2073 2071
2074 for (i = 0; i < ESI_LEN; i++) { 2072 for (i = 0; i < ESI_LEN; i++) {
2075 fore200e->esi[ i ] = fore200e->atm_dev->esi[ i ] = prom->mac_addr[ i + 2 ]; 2073 fore200e->esi[ i ] = fore200e->atm_dev->esi[ i ] = prom->mac_addr[ i + 2 ];
@@ -2845,13 +2843,12 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
2845 " interrupt line:\t\t%s\n" 2843 " interrupt line:\t\t%s\n"
2846 " physical base address:\t0x%p\n" 2844 " physical base address:\t0x%p\n"
2847 " virtual base address:\t0x%p\n" 2845 " virtual base address:\t0x%p\n"
2848 " factory address (ESI):\t%02x:%02x:%02x:%02x:%02x:%02x\n" 2846 " factory address (ESI):\t%pM\n"
2849 " board serial number:\t\t%d\n\n", 2847 " board serial number:\t\t%d\n\n",
2850 fore200e_irq_itoa(fore200e->irq), 2848 fore200e_irq_itoa(fore200e->irq),
2851 (void*)fore200e->phys_base, 2849 (void*)fore200e->phys_base,
2852 fore200e->virt_base, 2850 fore200e->virt_base,
2853 fore200e->esi[0], fore200e->esi[1], fore200e->esi[2], 2851 fore200e->esi,
2854 fore200e->esi[3], fore200e->esi[4], fore200e->esi[5],
2855 fore200e->esi[4] * 256 + fore200e->esi[5]); 2852 fore200e->esi[4] * 256 + fore200e->esi[5]);
2856 2853
2857 return len; 2854 return len;