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/fealnx.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/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, | |||
578 | 578 | ||
579 | if (mii_status != 0xffff && mii_status != 0x0000) { | 579 | if (mii_status != 0xffff && mii_status != 0x0000) { |
580 | np->phys[phy_idx++] = phy; | 580 | np->phys[phy_idx++] = phy; |
581 | printk(KERN_INFO | 581 | dev_printk(KERN_INFO, &pdev->dev, |
582 | "%s: MII PHY found at address %d, status " | 582 | "MII PHY found at address %d, status " |
583 | "0x%4.4x.\n", dev->name, phy, mii_status); | 583 | "0x%4.4x.\n", phy, mii_status); |
584 | /* get phy type */ | 584 | /* get phy type */ |
585 | { | 585 | { |
586 | unsigned int data; | 586 | unsigned int data; |
@@ -603,10 +603,10 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev, | |||
603 | } | 603 | } |
604 | 604 | ||
605 | np->mii_cnt = phy_idx; | 605 | np->mii_cnt = phy_idx; |
606 | if (phy_idx == 0) { | 606 | if (phy_idx == 0) |
607 | printk(KERN_WARNING "%s: MII PHY not found -- this device may " | 607 | dev_printk(KERN_WARNING, &pdev->dev, |
608 | "not operate correctly.\n", dev->name); | 608 | "MII PHY not found -- this device may " |
609 | } | 609 | "not operate correctly.\n"); |
610 | } else { | 610 | } else { |
611 | np->phys[0] = 32; | 611 | np->phys[0] = 32; |
612 | /* 89/6/23 add, (begin) */ | 612 | /* 89/6/23 add, (begin) */ |
@@ -632,7 +632,8 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev, | |||
632 | np->mii.full_duplex = full_duplex[card_idx]; | 632 | np->mii.full_duplex = full_duplex[card_idx]; |
633 | 633 | ||
634 | if (np->mii.full_duplex) { | 634 | if (np->mii.full_duplex) { |
635 | printk(KERN_INFO "%s: Media type forced to Full Duplex.\n", dev->name); | 635 | dev_printk(KERN_INFO, &pdev->dev, |
636 | "Media type forced to Full Duplex.\n"); | ||
636 | /* 89/6/13 add, (begin) */ | 637 | /* 89/6/13 add, (begin) */ |
637 | // if (np->PHYType==MarvellPHY) | 638 | // if (np->PHYType==MarvellPHY) |
638 | if ((np->PHYType == MarvellPHY) || (np->PHYType == LevelOnePHY)) { | 639 | if ((np->PHYType == MarvellPHY) || (np->PHYType == LevelOnePHY)) { |