diff options
| author | hartleys <hartleys@visionengravers.com> | 2010-01-05 01:26:49 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-07 04:13:57 -0500 |
| commit | 8d9ded23b3259c7f6883e97284e949af7afd4e40 (patch) | |
| tree | de54e649d8a25a5ca2249573d50aa2c86a47e967 /drivers/atm | |
| parent | 3008ab36e23623cbe7a53bff2d495eca5426a9ce (diff) | |
drivers/atm/lanai.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/lanai.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c index cf97c34cbaf1..7fe7c324e7ef 100644 --- a/drivers/atm/lanai.c +++ b/drivers/atm/lanai.c | |||
| @@ -998,9 +998,7 @@ static int __devinit eeprom_validate(struct lanai_dev *lanai) | |||
| 998 | (unsigned int) e[EEPROM_MAC_REV + i]); | 998 | (unsigned int) e[EEPROM_MAC_REV + i]); |
| 999 | return -EIO; | 999 | return -EIO; |
| 1000 | } | 1000 | } |
| 1001 | DPRINTK("eeprom: MAC address = %02X:%02X:%02X:%02X:%02X:%02X\n", | 1001 | DPRINTK("eeprom: MAC address = %pM\n", &e[EEPROM_MAC]); |
| 1002 | e[EEPROM_MAC + 0], e[EEPROM_MAC + 1], e[EEPROM_MAC + 2], | ||
| 1003 | e[EEPROM_MAC + 3], e[EEPROM_MAC + 4], e[EEPROM_MAC + 5]); | ||
| 1004 | /* Verify serial number */ | 1002 | /* Verify serial number */ |
| 1005 | lanai->serialno = eeprom_be4(lanai, EEPROM_SERIAL); | 1003 | lanai->serialno = eeprom_be4(lanai, EEPROM_SERIAL); |
| 1006 | v = eeprom_be4(lanai, EEPROM_SERIAL_REV); | 1004 | 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) | |||
| 2483 | return sprintf(page, "revision: board=%d, pci_if=%d\n", | 2481 | return sprintf(page, "revision: board=%d, pci_if=%d\n", |
| 2484 | lanai->board_rev, (int) lanai->pci->revision); | 2482 | lanai->board_rev, (int) lanai->pci->revision); |
| 2485 | if (left-- == 0) | 2483 | if (left-- == 0) |
| 2486 | return sprintf(page, "EEPROM ESI: " | 2484 | return sprintf(page, "EEPROM ESI: %pM\n", |
| 2487 | "%02X:%02X:%02X:%02X:%02X:%02X\n", | 2485 | &lanai->eeprom[EEPROM_MAC]); |
| 2488 | lanai->eeprom[EEPROM_MAC + 0], | ||
| 2489 | lanai->eeprom[EEPROM_MAC + 1], | ||
| 2490 | lanai->eeprom[EEPROM_MAC + 2], | ||
| 2491 | lanai->eeprom[EEPROM_MAC + 3], | ||
| 2492 | lanai->eeprom[EEPROM_MAC + 4], | ||
| 2493 | lanai->eeprom[EEPROM_MAC + 5]); | ||
| 2494 | if (left-- == 0) | 2486 | if (left-- == 0) |
| 2495 | return sprintf(page, "status: SOOL=%d, LOCD=%d, LED=%d, " | 2487 | return sprintf(page, "status: SOOL=%d, LOCD=%d, LED=%d, " |
| 2496 | "GPIN=%d\n", (lanai->status & STATUS_SOOL) ? 1 : 0, | 2488 | "GPIN=%d\n", (lanai->status & STATUS_SOOL) ? 1 : 0, |