diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-06-27 11:39:50 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-07-05 13:42:57 -0400 |
commit | 9b91cf9daac41eeaaea57ecfe68dc13bb0305fa9 (patch) | |
tree | 301308991315efc8dbe07ccfe1ee2f937b50a1c1 /drivers/net/ns83820.c | |
parent | 2e8a538d865de0eb9813c8a0f2284e920299c0cc (diff) |
[netdrvr] use dev_xxx() printk helpers, rather than dev_printk(KERN_xxx, ...
Suggested by Jiri Slaby.
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/ns83820.c')
-rw-r--r-- | drivers/net/ns83820.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c index d6e7ac2d0c94..d0ed8646902f 100644 --- 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_ | |||
1832 | } else if (!pci_set_dma_mask(pci_dev, DMA_32BIT_MASK)) { | 1832 | } else if (!pci_set_dma_mask(pci_dev, DMA_32BIT_MASK)) { |
1833 | using_dac = 0; | 1833 | using_dac = 0; |
1834 | } else { | 1834 | } else { |
1835 | dev_printk(KERN_WARNING, &pci_dev->dev, | 1835 | dev_warn(&pci_dev->dev, "pci_set_dma_mask failed!\n"); |
1836 | "pci_set_dma_mask failed!\n"); | ||
1837 | return -ENODEV; | 1836 | return -ENODEV; |
1838 | } | 1837 | } |
1839 | 1838 | ||
@@ -1856,8 +1855,7 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_ | |||
1856 | 1855 | ||
1857 | err = pci_enable_device(pci_dev); | 1856 | err = pci_enable_device(pci_dev); |
1858 | if (err) { | 1857 | if (err) { |
1859 | dev_printk(KERN_INFO, &pci_dev->dev, | 1858 | dev_info(&pci_dev->dev, "pci_enable_dev failed: %d\n", err); |
1860 | "pci_enable_dev failed: %d\n", err); | ||
1861 | goto out_free; | 1859 | goto out_free; |
1862 | } | 1860 | } |
1863 | 1861 | ||
@@ -1886,8 +1884,7 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_ | |||
1886 | err = request_irq(pci_dev->irq, ns83820_irq, IRQF_SHARED, | 1884 | err = request_irq(pci_dev->irq, ns83820_irq, IRQF_SHARED, |
1887 | DRV_NAME, ndev); | 1885 | DRV_NAME, ndev); |
1888 | if (err) { | 1886 | if (err) { |
1889 | dev_printk(KERN_INFO, &pci_dev->dev, | 1887 | dev_info(&pci_dev->dev, "unable to register irq %d, err %d\n", |
1890 | "unable to register irq %d, err %d\n", | ||
1891 | pci_dev->irq, err); | 1888 | pci_dev->irq, err); |
1892 | goto out_disable; | 1889 | goto out_disable; |
1893 | } | 1890 | } |
@@ -1902,8 +1899,7 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_ | |||
1902 | rtnl_lock(); | 1899 | rtnl_lock(); |
1903 | err = dev_alloc_name(ndev, ndev->name); | 1900 | err = dev_alloc_name(ndev, ndev->name); |
1904 | if (err < 0) { | 1901 | if (err < 0) { |
1905 | dev_printk(KERN_INFO, &pci_dev->dev, | 1902 | dev_info(&pci_dev->dev, "unable to get netdev name: %d\n", err); |
1906 | "unable to get netdev name: %d\n", err); | ||
1907 | goto out_free_irq; | 1903 | goto out_free_irq; |
1908 | } | 1904 | } |
1909 | 1905 | ||