[netdrvr] use dev_xxx() printk helpers, rather than dev_printk(KERN_xxx, ...

[karo-tx-linux.git] / drivers / net / ns83820.c

diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index d6e7ac2d0c94e906c0cd276ce2413e4c685ed0fc..d0ed8646902f9cc968a42b155f4f264de26209a6 100644 (file)
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -1832,8 +1832,7 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_
        } else if (!pci_set_dma_mask(pci_dev, DMA_32BIT_MASK)) {
                using_dac = 0;
        } else {
-               dev_printk(KERN_WARNING, &pci_dev->dev,
-                       "pci_set_dma_mask failed!\n");
+               dev_warn(&pci_dev->dev, "pci_set_dma_mask failed!\n");
                return -ENODEV;
        }
 
@@ -1856,8 +1855,7 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_
 
        err = pci_enable_device(pci_dev);
        if (err) {
-               dev_printk(KERN_INFO, &pci_dev->dev,
-                       "pci_enable_dev failed: %d\n", err);
+               dev_info(&pci_dev->dev, "pci_enable_dev failed: %d\n", err);
                goto out_free;
        }
 
@@ -1886,8 +1884,7 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_
        err = request_irq(pci_dev->irq, ns83820_irq, IRQF_SHARED,
                          DRV_NAME, ndev);
        if (err) {
-               dev_printk(KERN_INFO, &pci_dev->dev,
-                       "unable to register irq %d, err %d\n",
+               dev_info(&pci_dev->dev, "unable to register irq %d, err %d\n",
                        pci_dev->irq, err);
                goto out_disable;
        }
@@ -1902,8 +1899,7 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_
        rtnl_lock();
        err = dev_alloc_name(ndev, ndev->name);
        if (err < 0) {
-               dev_printk(KERN_INFO, &pci_dev->dev,
-                       "unable to get netdev name: %d\n", err);
+               dev_info(&pci_dev->dev, "unable to get netdev name: %d\n", err);
                goto out_free_irq;
        }