2 files changed, 3 insertions, 6 deletions

diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index 962c309b40c0..44f778507770 100644
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -92,7 +92,7 @@
 
 #define FORE200E_INDEX(virt_addr, type, index)     (&((type *)(virt_addr))[ index ])
 
-#define FORE200E_NEXT_ENTRY(index, modulo)         (index = ++(index) % (modulo))
+#define FORE200E_NEXT_ENTRY(index, modulo)         (index = ((index) + 1) % (modulo))
 
 #if 1
 #define ASSERT(expr)     if (!(expr)) { \
diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
index a395c9aab146..52880c8387d8 100644
--- a/drivers/atm/lanai.c
+++ b/drivers/atm/lanai.c
@@ -2241,11 +2241,8 @@ static int __devinit lanai_dev_open(struct atm_dev *atmdev)
         memcpy(atmdev->esi, eeprom_mac(lanai), ESI_LEN);
         lanai_timed_poll_start(lanai);
         printk(KERN_NOTICE DEV_LABEL "(itf %d): rev.%d, base=0x%lx, irq=%u "
-            "(%02X-%02X-%02X-%02X-%02X-%02X)\n", lanai->number,
-            (int) lanai->pci->revision, (unsigned long) lanai->base,
-            lanai->pci->irq,
-            atmdev->esi[0], atmdev->esi[1], atmdev->esi[2],
-            atmdev->esi[3], atmdev->esi[4], atmdev->esi[5]);
+                "(%pMF)\n", lanai->number, (int) lanai->pci->revision,
+                (unsigned long) lanai->base, lanai->pci->irq, atmdev->esi);
         printk(KERN_NOTICE DEV_LABEL "(itf %d): LANAI%s, serialno=%u(0x%X), "
             "board_rev=%d\n", lanai->number,
             lanai->type==lanai2 ? "2" : "HB", (unsigned int) lanai->serialno,