diff options
Diffstat (limited to 'drivers/net/fealnx.c')
-rw-r--r-- | drivers/net/fealnx.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c index d26140ad36e9..97d34fee8c1f 100644 --- a/drivers/net/fealnx.c +++ b/drivers/net/fealnx.c | |||
@@ -505,7 +505,7 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev, | |||
505 | 505 | ||
506 | len = pci_resource_len(pdev, bar); | 506 | len = pci_resource_len(pdev, bar); |
507 | if (len < MIN_REGION_SIZE) { | 507 | if (len < MIN_REGION_SIZE) { |
508 | dev_printk(KERN_ERR, &pdev->dev, | 508 | dev_err(&pdev->dev, |
509 | "region size %ld too small, aborting\n", len); | 509 | "region size %ld too small, aborting\n", len); |
510 | return -ENODEV; | 510 | return -ENODEV; |
511 | } | 511 | } |
@@ -578,7 +578,7 @@ 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 | dev_printk(KERN_INFO, &pdev->dev, | 581 | dev_info(&pdev->dev, |
582 | "MII PHY found at address %d, status " | 582 | "MII PHY found at address %d, status " |
583 | "0x%4.4x.\n", phy, mii_status); | 583 | "0x%4.4x.\n", phy, mii_status); |
584 | /* get phy type */ | 584 | /* get phy type */ |
@@ -604,7 +604,7 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev, | |||
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 | dev_printk(KERN_WARNING, &pdev->dev, | 607 | dev_warn(&pdev->dev, |
608 | "MII PHY not found -- this device may " | 608 | "MII PHY not found -- this device may " |
609 | "not operate correctly.\n"); | 609 | "not operate correctly.\n"); |
610 | } else { | 610 | } else { |
@@ -632,8 +632,7 @@ 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 | dev_printk(KERN_INFO, &pdev->dev, | 635 | dev_info(&pdev->dev, "Media type forced to Full Duplex.\n"); |
636 | "Media type forced to Full Duplex.\n"); | ||
637 | /* 89/6/13 add, (begin) */ | 636 | /* 89/6/13 add, (begin) */ |
638 | // if (np->PHYType==MarvellPHY) | 637 | // if (np->PHYType==MarvellPHY) |
639 | if ((np->PHYType == MarvellPHY) || (np->PHYType == LevelOnePHY)) { | 638 | if ((np->PHYType == MarvellPHY) || (np->PHYType == LevelOnePHY)) { |