[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>

1 files changed, 15 insertions, 9 deletions

diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c
index 3388ee1313ea..9c1ce318b077 100644
--- a/drivers/net/pci-skeleton.c
+++ b/drivers/net/pci-skeleton.c
@@ -601,7 +601,8 @@ static int __devinit netdrv_init_board (struct pci_dev *pdev,
         /* dev zeroed in alloc_etherdev */
         dev = alloc_etherdev (sizeof (*tp));
         if (dev == NULL) {
-                printk (KERN_ERR PFX "unable to alloc new ethernet\n");
+                dev_printk (KERN_ERR, &pdev->dev,
+                            "unable to alloc new ethernet\n");
                 DPRINTK ("EXIT, returning -ENOMEM\n");
                 return -ENOMEM;
         }
@@ -631,14 +632,16 @@ static int __devinit netdrv_init_board (struct pci_dev *pdev,
 
         /* make sure PCI base addr 0 is PIO */
         if (!(pio_flags & IORESOURCE_IO)) {
-                printk (KERN_ERR PFX "region #0 not a PIO resource, aborting\n");
+                dev_printk (KERN_ERR, &pdev->dev,
+                        "region #0 not a PIO resource, aborting\n");
                 rc = -ENODEV;
                 goto err_out;
         }
 
         /* make sure PCI base addr 1 is MMIO */
         if (!(mmio_flags & IORESOURCE_MEM)) {
-                printk (KERN_ERR PFX "region #1 not an MMIO resource, aborting\n");
+                dev_printk (KERN_ERR, &pdev->dev,
+                        "region #1 not an MMIO resource, aborting\n");
                 rc = -ENODEV;
                 goto err_out;
         }
@@ -646,12 +649,13 @@ static int __devinit netdrv_init_board (struct pci_dev *pdev,
         /* check for weird/broken PCI region reporting */
         if ((pio_len < NETDRV_MIN_IO_SIZE) ||
             (mmio_len < NETDRV_MIN_IO_SIZE)) {
-                printk (KERN_ERR PFX "Invalid PCI region size(s), aborting\n");
+                dev_printk (KERN_ERR, &pdev->dev,
+                        "Invalid PCI region size(s), aborting\n");
                 rc = -ENODEV;
                 goto err_out;
         }
 
-        rc = pci_request_regions (pdev, "pci-skeleton");
+        rc = pci_request_regions (pdev, MODNAME);
         if (rc)
                 goto err_out;
 
@@ -663,7 +667,8 @@ static int __devinit netdrv_init_board (struct pci_dev *pdev,
         /* ioremap MMIO region */
         ioaddr = ioremap (mmio_start, mmio_len);
         if (ioaddr == NULL) {
-                printk (KERN_ERR PFX "cannot remap MMIO, aborting\n");
+                dev_printk (KERN_ERR, &pdev->dev,
+                        "cannot remap MMIO, aborting\n");
                 rc = -EIO;
                 goto err_out_free_res;
         }
@@ -699,9 +704,10 @@ static int __devinit netdrv_init_board (struct pci_dev *pdev,
                 }
 
         /* if unknown chip, assume array element #0, original RTL-8139 in this case */
-        printk (KERN_DEBUG PFX "PCI device %s: unknown chip version, assuming RTL-8139\n",
-                pci_name(pdev));
-        printk (KERN_DEBUG PFX "PCI device %s: TxConfig = 0x%lx\n", pci_name(pdev), NETDRV_R32 (TxConfig));
+        dev_printk (KERN_DEBUG, &pdev->dev,
+                "unknown chip version, assuming RTL-8139\n");
+        dev_printk (KERN_DEBUG, &pdev->dev, "TxConfig = 0x%lx\n",
+                NETDRV_R32 (TxConfig));
         tp->chipset = 0;
 
 match: