1 files changed, 19 insertions, 16 deletions

diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index 1959654cbec8..1428bb7715af 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -1836,9 +1836,10 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 
         if (pdev->vendor == PCI_VENDOR_ID_REALTEK &&
             pdev->device == PCI_DEVICE_ID_REALTEK_8139 && pci_rev < 0x20) {
-                printk(KERN_ERR PFX "pci dev %s (id %04x:%04x rev %02x) is not an 8139C+ compatible chip\n",
-                       pci_name(pdev), pdev->vendor, pdev->device, pci_rev);
-                printk(KERN_ERR PFX "Try the \"8139too\" driver instead.\n");
+                dev_err(&pdev->dev,
+                           "This (id %04x:%04x rev %02x) is not an 8139C+ compatible chip\n",
+                           pdev->vendor, pdev->device, pci_rev);
+                dev_err(&pdev->dev, "Try the \"8139too\" driver instead.\n");
                 return -ENODEV;
         }
 
@@ -1876,14 +1877,13 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         pciaddr = pci_resource_start(pdev, 1);
         if (!pciaddr) {
                 rc = -EIO;
-                printk(KERN_ERR PFX "no MMIO resource for pci dev %s\n",
-                       pci_name(pdev));
+                dev_err(&pdev->dev, "no MMIO resource\n");
                 goto err_out_res;
         }
         if (pci_resource_len(pdev, 1) < CP_REGS_SIZE) {
                 rc = -EIO;
-                printk(KERN_ERR PFX "MMIO resource (%llx) too small on pci dev %s\n",
-                       (unsigned long long)pci_resource_len(pdev, 1), pci_name(pdev));
+                dev_err(&pdev->dev, "MMIO resource (%llx) too small\n",
+                       (unsigned long long)pci_resource_len(pdev, 1));
                 goto err_out_res;
         }
 
@@ -1897,14 +1897,15 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 
                 rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
                 if (rc) {
-                        printk(KERN_ERR PFX "No usable DMA configuration, "
-                               "aborting.\n");
+                        dev_err(&pdev->dev,
+                                   "No usable DMA configuration, aborting.\n");
                         goto err_out_res;
                 }
                 rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
                 if (rc) {
-                        printk(KERN_ERR PFX "No usable consistent DMA configuration, "
-                               "aborting.\n");
+                        dev_err(&pdev->dev,
+                                   "No usable consistent DMA configuration, "
+                                   "aborting.\n");
                         goto err_out_res;
                 }
         }
@@ -1915,9 +1916,9 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         regs = ioremap(pciaddr, CP_REGS_SIZE);
         if (!regs) {
                 rc = -EIO;
-                printk(KERN_ERR PFX "Cannot map PCI MMIO (%llx@%llx) on pci dev %s\n",
-                        (unsigned long long)pci_resource_len(pdev, 1),
-                        (unsigned long long)pciaddr, pci_name(pdev));
+                dev_err(&pdev->dev, "Cannot map PCI MMIO (%Lx@%Lx)\n",
+                       (unsigned long long)pci_resource_len(pdev, 1),
+                       (unsigned long long)pciaddr);
                 goto err_out_res;
         }
         dev->base_addr = (unsigned long) regs;
@@ -1986,7 +1987,8 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         /* enable busmastering and memory-write-invalidate */
         pci_set_master(pdev);
 
-        if (cp->wol_enabled) cp_set_d3_state (cp);
+        if (cp->wol_enabled)
+                cp_set_d3_state (cp);
 
         return 0;
 
@@ -2011,7 +2013,8 @@ static void cp_remove_one (struct pci_dev *pdev)
         BUG_ON(!dev);
         unregister_netdev(dev);
         iounmap(cp->regs);
-        if (cp->wol_enabled) pci_set_power_state (pdev, PCI_D0);
+        if (cp->wol_enabled)
+                pci_set_power_state (pdev, PCI_D0);
         pci_release_regions(pdev);
         pci_clear_mwi(pdev);
         pci_disable_device(pdev);