Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[pandora-kernel.git] / drivers / staging / octeon / ethernet-mdio.c

diff --git a/drivers/staging/octeon/ethernet-mdio.c b/drivers/staging/octeon/ethernet-mdio.c
index 8a11ffc..f18e3e1 100644 (file)
--- a/drivers/staging/octeon/ethernet-mdio.c
+++ b/drivers/staging/octeon/ethernet-mdio.c
@@ -27,6 +27,7 @@
 #include <linux/kernel.h>
 #include <linux/ethtool.h>
 #include <linux/phy.h>
+#include <linux/ratelimit.h>
 
 #include <net/dst.h>
 
@@ -129,22 +130,22 @@ static void cvm_oct_adjust_link(struct net_device *dev)
                if (priv->last_link) {
                        netif_carrier_on(dev);
                        if (priv->queue != -1)
-                               DEBUGPRINT("%s: %u Mbps %s duplex, "
-                                          "port %2d, queue %2d\n",
-                                          dev->name, priv->phydev->speed,
-                                          priv->phydev->duplex ?
-                                               "Full" : "Half",
-                                          priv->port, priv->queue);
+                               printk_ratelimited("%s: %u Mbps %s duplex, "
+                                                  "port %2d, queue %2d\n",
+                                                  dev->name, priv->phydev->speed,
+                                                  priv->phydev->duplex ?
+                                                  "Full" : "Half",
+                                                  priv->port, priv->queue);
                        else
-                               DEBUGPRINT("%s: %u Mbps %s duplex, "
-                                          "port %2d, POW\n",
-                                          dev->name, priv->phydev->speed,
-                                          priv->phydev->duplex ?
-                                               "Full" : "Half",
-                                          priv->port);
+                               printk_ratelimited("%s: %u Mbps %s duplex, "
+                                                  "port %2d, POW\n",
+                                                  dev->name, priv->phydev->speed,
+                                                  priv->phydev->duplex ?
+                                                  "Full" : "Half",
+                                                  priv->port);
                } else {
                        netif_carrier_off(dev);
-                       DEBUGPRINT("%s: Link down\n", dev->name);
+                       printk_ratelimited("%s: Link down\n", dev->name);
                }
        }
 }