Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / atm / lanai.c

diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
index cbe15a86c6698b2044b45469fa57f8d199aca15e..52880c8387d823f861745840ff27539adf1daba7 100644 (file)
--- 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,
@@ -2591,7 +2588,7 @@ static int __devinit lanai_init_one(struct pci_dev *pci,
                return -ENOMEM;
        }
 
-       atmdev = atm_dev_register(DEV_LABEL, &ops, -1, NULL);
+       atmdev = atm_dev_register(DEV_LABEL, &pci->dev, &ops, -1, NULL);
        if (atmdev == NULL) {
                printk(KERN_ERR DEV_LABEL
                    ": couldn't register atm device!\n");