mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-12 05:48:40 +00:00
Code Issues Releases Wiki Activity

drivers/atm/lanai.c: use %pM to show MAC address

Browse source 
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>
This commit is contained in:
hartleys 2010-01-05 06:26:49 +00:00 committed by David S. Miller
parent 3008ab36e2
commit 8d9ded23b3
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/atm/lanai.c
View file

@ -998,9 +998,7 @@ static int __devinit eeprom_validate(struct lanai_dev *lanai)
(unsigned int) e[EEPROM_MAC_REV + i]); (unsigned int) e[EEPROM_MAC_REV + i]);
return -EIO; return -EIO;
} }
DPRINTK("eeprom: MAC address = %02X:%02X:%02X:%02X:%02X:%02X\n", DPRINTK("eeprom: MAC address = %pM\n", &e[EEPROM_MAC]);
e[EEPROM_MAC + 0], e[EEPROM_MAC + 1], e[EEPROM_MAC + 2],
e[EEPROM_MAC + 3], e[EEPROM_MAC + 4], e[EEPROM_MAC + 5]);
/* Verify serial number */ /* Verify serial number */
lanai->serialno = eeprom_be4(lanai, EEPROM_SERIAL); lanai->serialno = eeprom_be4(lanai, EEPROM_SERIAL);
v = eeprom_be4(lanai, EEPROM_SERIAL_REV); v = eeprom_be4(lanai, EEPROM_SERIAL_REV);
@ -2483,14 +2481,8 @@ static int lanai_proc_read(struct atm_dev *atmdev, loff_t *pos, char *page)
return sprintf(page, "revision: board=%d, pci_if=%d\n", return sprintf(page, "revision: board=%d, pci_if=%d\n",
lanai->board_rev, (int) lanai->pci->revision); lanai->board_rev, (int) lanai->pci->revision);
if (left-- == 0) if (left-- == 0)
return sprintf(page, "EEPROM ESI: " return sprintf(page, "EEPROM ESI: %pM\n",
"%02X:%02X:%02X:%02X:%02X:%02X\n", &lanai->eeprom[EEPROM_MAC]);
lanai->eeprom[EEPROM_MAC + 0],
lanai->eeprom[EEPROM_MAC + 1],
lanai->eeprom[EEPROM_MAC + 2],
lanai->eeprom[EEPROM_MAC + 3],
lanai->eeprom[EEPROM_MAC + 4],
lanai->eeprom[EEPROM_MAC + 5]);
if (left-- == 0) if (left-- == 0)
return sprintf(page, "status: SOOL=%d, LOCD=%d, LED=%d, " return sprintf(page, "status: SOOL=%d, LOCD=%d, LED=%d, "
"GPIN=%d\n", (lanai->status & STATUS_SOOL) ? 1 : 0, "GPIN=%d\n", (lanai->status & STATUS_SOOL) ? 1 : 0,