drivers/atm/lanai.c: use %pM to show MAC address
hartleys [Tue, 5 Jan 2010 06:26:49 +0000 (06:26 +0000)]
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>

drivers/atm/lanai.c

index cf97c34..7fe7c32 100644 (file)
@@ -998,9 +998,7 @@ static int __devinit eeprom_validate(struct lanai_dev *lanai)
                            (unsigned int) e[EEPROM_MAC_REV + i]);
                        return -EIO;
                }
-       DPRINTK("eeprom: MAC address = %02X:%02X:%02X:%02X:%02X:%02X\n",
-               e[EEPROM_MAC + 0], e[EEPROM_MAC + 1], e[EEPROM_MAC + 2],
-               e[EEPROM_MAC + 3], e[EEPROM_MAC + 4], e[EEPROM_MAC + 5]);
+       DPRINTK("eeprom: MAC address = %pM\n", &e[EEPROM_MAC]);
        /* Verify serial number */
        lanai->serialno = eeprom_be4(lanai, EEPROM_SERIAL);
        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",
                    lanai->board_rev, (int) lanai->pci->revision);
        if (left-- == 0)
-               return sprintf(page, "EEPROM ESI: "
-                   "%02X:%02X:%02X:%02X:%02X:%02X\n",
-                   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]);
+               return sprintf(page, "EEPROM ESI: %pM\n",
+                   &lanai->eeprom[EEPROM_MAC]);
        if (left-- == 0)
                return sprintf(page, "status: SOOL=%d, LOCD=%d, LED=%d, "
                    "GPIN=%d\n", (lanai->status & STATUS_SOOL) ? 1 : 0,