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/ne2k-pci.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/ne2k-pci.c')
-rw-r--r-- | drivers/net/ne2k-pci.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c index 4f226064d55e..34bdba9eec79 100644 --- a/drivers/net/ne2k-pci.c +++ b/drivers/net/ne2k-pci.c | |||
@@ -231,14 +231,12 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev, | |||
231 | irq = pdev->irq; | 231 | irq = pdev->irq; |
232 | 232 | ||
233 | if (!ioaddr || ((pci_resource_flags (pdev, 0) & IORESOURCE_IO) == 0)) { | 233 | if (!ioaddr || ((pci_resource_flags (pdev, 0) & IORESOURCE_IO) == 0)) { |
234 | dev_printk (KERN_ERR, &pdev->dev, | 234 | dev_err(&pdev->dev, "no I/O resource at PCI BAR #0\n"); |
235 | "no I/O resource at PCI BAR #0\n"); | ||
236 | return -ENODEV; | 235 | return -ENODEV; |
237 | } | 236 | } |
238 | 237 | ||
239 | if (request_region (ioaddr, NE_IO_EXTENT, DRV_NAME) == NULL) { | 238 | if (request_region (ioaddr, NE_IO_EXTENT, DRV_NAME) == NULL) { |
240 | dev_printk (KERN_ERR, &pdev->dev, | 239 | dev_err(&pdev->dev, "I/O resource 0x%x @ 0x%lx busy\n", |
241 | "I/O resource 0x%x @ 0x%lx busy\n", | ||
242 | NE_IO_EXTENT, ioaddr); | 240 | NE_IO_EXTENT, ioaddr); |
243 | return -EBUSY; | 241 | return -EBUSY; |
244 | } | 242 | } |
@@ -265,8 +263,7 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev, | |||
265 | /* Allocate net_device, dev->priv; fill in 8390 specific dev fields. */ | 263 | /* Allocate net_device, dev->priv; fill in 8390 specific dev fields. */ |
266 | dev = alloc_ei_netdev(); | 264 | dev = alloc_ei_netdev(); |
267 | if (!dev) { | 265 | if (!dev) { |
268 | dev_printk (KERN_ERR, &pdev->dev, | 266 | dev_err(&pdev->dev, "cannot allocate ethernet device\n"); |
269 | "cannot allocate ethernet device\n"); | ||
270 | goto err_out_free_res; | 267 | goto err_out_free_res; |
271 | } | 268 | } |
272 | SET_MODULE_OWNER(dev); | 269 | SET_MODULE_OWNER(dev); |
@@ -284,7 +281,7 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev, | |||
284 | while ((inb(ioaddr + EN0_ISR) & ENISR_RESET) == 0) | 281 | while ((inb(ioaddr + EN0_ISR) & ENISR_RESET) == 0) |
285 | /* Limit wait: '2' avoids jiffy roll-over. */ | 282 | /* Limit wait: '2' avoids jiffy roll-over. */ |
286 | if (jiffies - reset_start_time > 2) { | 283 | if (jiffies - reset_start_time > 2) { |
287 | dev_printk(KERN_ERR, &pdev->dev, | 284 | dev_err(&pdev->dev, |
288 | "Card failure (no reset ack).\n"); | 285 | "Card failure (no reset ack).\n"); |
289 | goto err_out_free_netdev; | 286 | goto err_out_free_netdev; |
290 | } | 287 | } |