1 files changed, 11 insertions, 18 deletions

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 5502b9aeda53..64b6a72b4f6a 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -5575,13 +5575,12 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
         /* enable device (incl. PCI PM wakeup), and bus-mastering */
         rc = pci_enable_device(pdev);
         if (rc) {
-                dev_printk(KERN_ERR, &pdev->dev,
-                        "Cannot enable PCI device, aborting.");
+                dev_err(&pdev->dev, "Cannot enable PCI device, aborting.");
                 goto err_out;
         }
 
         if (!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)) {
-                dev_printk(KERN_ERR, &pdev->dev,
+                dev_err(&pdev->dev,
                         "Cannot find PCI device base address, aborting.\n");
                 rc = -ENODEV;
                 goto err_out_disable;
@@ -5589,8 +5588,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
 
         rc = pci_request_regions(pdev, DRV_MODULE_NAME);
         if (rc) {
-                dev_printk(KERN_ERR, &pdev->dev,
-                        "Cannot obtain PCI resources, aborting.\n");
+                dev_err(&pdev->dev, "Cannot obtain PCI resources, aborting.\n");
                 goto err_out_disable;
         }
 
@@ -5598,7 +5596,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
 
         bp->pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM);
         if (bp->pm_cap == 0) {
-                dev_printk(KERN_ERR, &pdev->dev,
+                dev_err(&pdev->dev,
                         "Cannot find power management capability, aborting.\n");
                 rc = -EIO;
                 goto err_out_release;
@@ -5606,8 +5604,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
 
         bp->pcix_cap = pci_find_capability(pdev, PCI_CAP_ID_PCIX);
         if (bp->pcix_cap == 0) {
-                dev_printk(KERN_ERR, &pdev->dev,
-                        "Cannot find PCIX capability, aborting.\n");
+                dev_err(&pdev->dev, "Cannot find PCIX capability, aborting.\n");
                 rc = -EIO;
                 goto err_out_release;
         }
@@ -5615,15 +5612,14 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
         if (pci_set_dma_mask(pdev, DMA_64BIT_MASK) == 0) {
                 bp->flags |= USING_DAC_FLAG;
                 if (pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK) != 0) {
-                        dev_printk(KERN_ERR, &pdev->dev,
+                        dev_err(&pdev->dev,
                                 "pci_set_consistent_dma_mask failed, aborting.\n");
                         rc = -EIO;
                         goto err_out_release;
                 }
         }
         else if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) != 0) {
-                dev_printk(KERN_ERR, &pdev->dev,
-                        "System does not support DMA, aborting.\n");
+                dev_err(&pdev->dev, "System does not support DMA, aborting.\n");
                 rc = -EIO;
                 goto err_out_release;
         }
@@ -5643,8 +5639,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
         bp->regview = ioremap_nocache(dev->base_addr, mem_len);
 
         if (!bp->regview) {
-                dev_printk(KERN_ERR, &pdev->dev,
-                        "Cannot map register space, aborting.\n");
+                dev_err(&pdev->dev, "Cannot map register space, aborting.\n");
                 rc = -ENOMEM;
                 goto err_out_release;
         }
@@ -5716,7 +5711,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
         else if ((CHIP_ID(bp) == CHIP_ID_5706_A1) &&
                 !(bp->flags & PCIX_FLAG)) {
 
-                dev_printk(KERN_ERR, &pdev->dev,
+                dev_err(&pdev->dev,
                         "5706 A1 can only be used in a PCIX bus, aborting.\n");
                 goto err_out_unmap;
         }
@@ -5738,8 +5733,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
 
         if ((reg & BNX2_DEV_INFO_SIGNATURE_MAGIC_MASK) !=
             BNX2_DEV_INFO_SIGNATURE_MAGIC) {
-                dev_printk(KERN_ERR, &pdev->dev,
-                        "Firmware not running, aborting.\n");
+                dev_err(&pdev->dev, "Firmware not running, aborting.\n");
                 rc = -ENODEV;
                 goto err_out_unmap;
         }
@@ -5901,8 +5895,7 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 #endif
 
         if ((rc = register_netdev(dev))) {
-                dev_printk(KERN_ERR, &pdev->dev,
-                        "Cannot register net device\n");
+                dev_err(&pdev->dev, "Cannot register net device\n");
                 if (bp->regview)
                         iounmap(bp->regview);
                 pci_release_regions(pdev);