diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-27 16:47:51 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-07-05 19:42:07 +0200 |
| commit | 2e8a538d865de0eb9813c8a0f2284e920299c0cc (patch) | |
| tree | 30b773865f17b6a2768171f62fdae9700b54ec44 /drivers/net/fealnx.c | |
| parent | [netdrvr] via-velocity: remove io_size struct member, it is invariant (diff) | |
| download | linux-2e8a538d865de0eb9813c8a0f2284e920299c0cc.tar.xz linux-2e8a538d865de0eb9813c8a0f2284e920299c0cc.zip | |
[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/fealnx.c')
| -rw-r--r-- | drivers/net/fealnx.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c index aaf136658765..d26140ad36e9 100644 --- a/drivers/net/fealnx.c +++ b/drivers/net/fealnx.c @@ -578,9 +578,9 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev, if (mii_status != 0xffff && mii_status != 0x0000) { np->phys[phy_idx++] = phy; - printk(KERN_INFO - "%s: MII PHY found at address %d, status " - "0x%4.4x.\n", dev->name, phy, mii_status); + dev_printk(KERN_INFO, &pdev->dev, + "MII PHY found at address %d, status " + "0x%4.4x.\n", phy, mii_status); /* get phy type */ { unsigned int data; @@ -603,10 +603,10 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev, } np->mii_cnt = phy_idx; - if (phy_idx == 0) { - printk(KERN_WARNING "%s: MII PHY not found -- this device may " - "not operate correctly.\n", dev->name); - } + if (phy_idx == 0) + dev_printk(KERN_WARNING, &pdev->dev, + "MII PHY not found -- this device may " + "not operate correctly.\n"); } else { np->phys[0] = 32; /* 89/6/23 add, (begin) */ @@ -632,7 +632,8 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev, np->mii.full_duplex = full_duplex[card_idx]; if (np->mii.full_duplex) { - printk(KERN_INFO "%s: Media type forced to Full Duplex.\n", dev->name); + dev_printk(KERN_INFO, &pdev->dev, + "Media type forced to Full Duplex.\n"); /* 89/6/13 add, (begin) */ // if (np->PHYType==MarvellPHY) if ((np->PHYType == MarvellPHY) || (np->PHYType == LevelOnePHY)) { |