From 2fa6317d90da724dffac1db1d147cd9eefa6873b Mon Sep 17 00:00:00 2001 From: hartleys Date: Tue, 5 Jan 2010 06:26:49 +0000 Subject: [PATCH] --- yaml --- r: 183443 b: refs/heads/master c: 8d9ded23b3259c7f6883e97284e949af7afd4e40 h: refs/heads/master i: 183441: 7dccba30df3c8bcb209730d3d67cadb5f5e886c9 183439: 837e4f41a1a00d6330b5363227a62e1faa9b6cfe v: v3 --- [refs] | 2 +- trunk/drivers/atm/lanai.c | 14 +++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 7084e6264708..39a8758b9af7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3008ab36e23623cbe7a53bff2d495eca5426a9ce +refs/heads/master: 8d9ded23b3259c7f6883e97284e949af7afd4e40 diff --git a/trunk/drivers/atm/lanai.c b/trunk/drivers/atm/lanai.c index cf97c34cbaf1..7fe7c324e7ef 100644 --- a/trunk/drivers/atm/lanai.c +++ b/trunk/drivers/atm/lanai.c @@ -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,