Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / ehea / ehea_ethtool.c

diff --git a/drivers/net/ehea/ehea_ethtool.c b/drivers/net/ehea/ehea_ethtool.c
index d6cf502906cfeeafa41b1072a9aadf8a97a5b475..3e2e734fecb73b7ee586be244bd8775521a8c225 100644 (file)
--- a/drivers/net/ehea/ehea_ethtool.c
+++ b/drivers/net/ehea/ehea_ethtool.c
@@ -26,6 +26,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include "ehea.h"
 #include "ehea_phyp.h"
 
@@ -118,10 +120,10 @@ doit:
        ret = ehea_set_portspeed(port, sp);
 
        if (!ret)
-               ehea_info("%s: Port speed successfully set: %dMbps "
-                         "%s Duplex",
-                         port->netdev->name, port->port_speed,
-                         port->full_duplex == 1 ? "Full" : "Half");
+               netdev_info(dev,
+                           "Port speed successfully set: %dMbps %s Duplex\n",
+                           port->port_speed,
+                           port->full_duplex == 1 ? "Full" : "Half");
 out:
        return ret;
 }
@@ -134,10 +136,10 @@ static int ehea_nway_reset(struct net_device *dev)
        ret = ehea_set_portspeed(port, EHEA_SPEED_AUTONEG);
 
        if (!ret)
-               ehea_info("%s: Port speed successfully set: %dMbps "
-                         "%s Duplex",
-                         port->netdev->name, port->port_speed,
-                         port->full_duplex == 1 ? "Full" : "Half");
+               netdev_info(port->netdev,
+                           "Port speed successfully set: %dMbps %s Duplex\n",
+                           port->port_speed,
+                           port->full_duplex == 1 ? "Full" : "Half");
        return ret;
 }