Merge branch 'v3.10/topic/arm64-errata' into linux-linaro-lsk-v3.10

[firefly-linux-kernel-4.4.55.git] / drivers / eisa / pci_eisa.c

diff --git a/drivers/eisa/pci_eisa.c b/drivers/eisa/pci_eisa.c
index 6c3fca97d346db9c6912bd3977eec99c5c7d563a..a333bf3517de63a445c2636e85fb43cdc1d54c23 100644 (file)
--- a/drivers/eisa/pci_eisa.c
+++ b/drivers/eisa/pci_eisa.c
@@ -25,8 +25,7 @@ static int __init pci_eisa_init(struct pci_dev *pdev)
        struct resource *res, *bus_res = NULL;
 
        if ((rc = pci_enable_device (pdev))) {
-               printk (KERN_ERR "pci_eisa : Could not enable device %s\n",
-                       pci_name(pdev));
+               dev_err(&pdev->dev, "Could not enable device\n");
                return rc;
        }
 
@@ -59,7 +58,7 @@ static int __init pci_eisa_init(struct pci_dev *pdev)
        dev_set_drvdata(pci_eisa_root.dev, &pci_eisa_root);
 
        if (eisa_root_register (&pci_eisa_root)) {
-               printk (KERN_ERR "pci_eisa : Could not register EISA root\n");
+               dev_err(&pdev->dev, "Could not register EISA root\n");
                return -1;
        }