diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-06-27 10:47:51 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-07-05 13:42:07 -0400 |
commit | 2e8a538d865de0eb9813c8a0f2284e920299c0cc (patch) | |
tree | 30b773865f17b6a2768171f62fdae9700b54ec44 /drivers/net/eepro100.c | |
parent | cabb7667dc150320ccd9d6f64fbd7a34766bc775 (diff) |
[netdrvr] Use dev_printk() when ethernet interface isn't available
For messages prior to register_netdev(), prefer dev_printk() because
that prints out both our driver name and our [PCI | whatever] bus id.
Updates: 8139{cp,too}, b44, bnx2, cassini, {eepro,epic}100, fealnx,
hamachi, ne2k-pci, ns83820, pci-skeleton, r8169.
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/eepro100.c')
-rw-r--r-- | drivers/net/eepro100.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c index 2ad32754292..bccb12e03c2 100644 --- a/drivers/net/eepro100.c +++ b/drivers/net/eepro100.c | |||
@@ -555,12 +555,14 @@ static int __devinit eepro100_init_one (struct pci_dev *pdev, | |||
555 | 555 | ||
556 | if (!request_region(pci_resource_start(pdev, 1), | 556 | if (!request_region(pci_resource_start(pdev, 1), |
557 | pci_resource_len(pdev, 1), "eepro100")) { | 557 | pci_resource_len(pdev, 1), "eepro100")) { |
558 | printk (KERN_ERR "eepro100: cannot reserve I/O ports\n"); | 558 | dev_printk (KERN_ERR, &pdev->dev, |
559 | "eepro100: cannot reserve I/O ports\n"); | ||
559 | goto err_out_none; | 560 | goto err_out_none; |
560 | } | 561 | } |
561 | if (!request_mem_region(pci_resource_start(pdev, 0), | 562 | if (!request_mem_region(pci_resource_start(pdev, 0), |
562 | pci_resource_len(pdev, 0), "eepro100")) { | 563 | pci_resource_len(pdev, 0), "eepro100")) { |
563 | printk (KERN_ERR "eepro100: cannot reserve MMIO region\n"); | 564 | dev_printk (KERN_ERR, &pdev->dev, |
565 | "eepro100: cannot reserve MMIO region\n"); | ||
564 | goto err_out_free_pio_region; | 566 | goto err_out_free_pio_region; |
565 | } | 567 | } |
566 | 568 | ||
@@ -573,7 +575,7 @@ static int __devinit eepro100_init_one (struct pci_dev *pdev, | |||
573 | 575 | ||
574 | ioaddr = pci_iomap(pdev, pci_bar, 0); | 576 | ioaddr = pci_iomap(pdev, pci_bar, 0); |
575 | if (!ioaddr) { | 577 | if (!ioaddr) { |
576 | printk (KERN_ERR "eepro100: cannot remap IO\n"); | 578 | dev_printk (KERN_ERR, &pdev->dev, "eepro100: cannot remap IO\n"); |
577 | goto err_out_free_mmio_region; | 579 | goto err_out_free_mmio_region; |
578 | } | 580 | } |
579 | 581 | ||