diff options
| author | Jay Cliburn <jacliburn@bellsouth.net> | 2007-04-29 21:42:10 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-05-08 01:20:15 -0400 |
| commit | 1e0063645ef1e89c63778fbb0417e79b7dc65b5f (patch) | |
| tree | d0804c056ea4e711d8ebe75cb09473096aca8ce2 /drivers/net/atl1/atl1_ethtool.c | |
| parent | 88ca2d070c3a169611ec38f00e945a036564ca26 (diff) | |
| download | kernel-crypto-1e0063645ef1e89c63778fbb0417e79b7dc65b5f.tar.gz kernel-crypto-1e0063645ef1e89c63778fbb0417e79b7dc65b5f.tar.xz kernel-crypto-1e0063645ef1e89c63778fbb0417e79b7dc65b5f.zip | |
atl1: use dev_printk macros
Use dev_printk macros for PCI related errors, warnings, debug and info
console messages.
Signed-off-by: Jay Cliburn <jacliburn@bellsouth.net>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/atl1/atl1_ethtool.c')
| -rw-r--r-- | drivers/net/atl1/atl1_ethtool.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/drivers/net/atl1/atl1_ethtool.c b/drivers/net/atl1/atl1_ethtool.c index c11c27798e5..1f616c5c147 100644 --- a/drivers/net/atl1/atl1_ethtool.c +++ b/drivers/net/atl1/atl1_ethtool.c @@ -156,8 +156,7 @@ static int atl1_set_settings(struct net_device *netdev, u16 old_media_type = hw->media_type; if (netif_running(adapter->netdev)) { - printk(KERN_DEBUG "%s: ethtool shutting down adapter\n", - atl1_driver_name); + dev_dbg(&adapter->pdev->dev, "ethtool shutting down adapter\n"); atl1_down(adapter); } @@ -166,9 +165,8 @@ static int atl1_set_settings(struct net_device *netdev, else { if (ecmd->speed == SPEED_1000) { if (ecmd->duplex != DUPLEX_FULL) { - printk(KERN_WARNING - "%s: can't force to 1000M half duplex\n", - atl1_driver_name); + dev_warn(&adapter->pdev->dev, + "can't force to 1000M half duplex\n"); ret_val = -EINVAL; goto exit_sset; } @@ -206,9 +204,8 @@ static int atl1_set_settings(struct net_device *netdev, } if (atl1_phy_setup_autoneg_adv(hw)) { ret_val = -EINVAL; - printk(KERN_WARNING - "%s: invalid ethtool speed/duplex setting\n", - atl1_driver_name); + dev_warn(&adapter->pdev->dev, + "invalid ethtool speed/duplex setting\n"); goto exit_sset; } if (hw->media_type == MEDIA_TYPE_AUTO_SENSOR || @@ -239,12 +236,10 @@ exit_sset: hw->media_type = old_media_type; if (netif_running(adapter->netdev)) { - printk(KERN_DEBUG "%s: ethtool starting adapter\n", - atl1_driver_name); + dev_dbg(&adapter->pdev->dev, "ethtool starting adapter\n"); atl1_up(adapter); } else if (!ret_val) { - printk(KERN_DEBUG "%s: ethtool resetting adapter\n", - atl1_driver_name); + dev_dbg(&adapter->pdev->dev, "ethtool resetting adapter\n"); atl1_reset(adapter); } return ret_val; |