Thread (34 messages) 34 messages, 5 authors, 2011-03-11

[PATCH 3/8] macb: convert printk to pr_ and friends

flat view
STALE5700d

From: joe@perches.com (Joe Perches)
Date: 2011-03-10 22:48:04
Also in: netdev

Revision v1 of 7 in this series.

Revisions (7)
  1. v1
  2. v1 current
  3. v1
  4. v1
  5. v1
  6. v1
  7. v1
On Thu, 2011-03-10 at 10:10 +0000, Jamie Iles wrote:
macb is already using the dev_dbg() and friends helpers so use pr_foo()
along with a pr_fmt() definition to make the printing a little cleaner.
Signed-off-by: Jamie Iles <redacted>
Hi Jamie.

Because these conversions use a struct net_device,
they would be better as:

	netdev_<foo>(struct net_device *dev, const char *fmt, ...)
quoted hunk ↗ jump to hunk
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
@@ -175,11 +176,11 @@ static void macb_handle_link_change(struct net_device *dev)
 
 	if (status_change) {
 		if (phydev->link)
-			printk(KERN_INFO "%s: link up (%d/%s)\n",
+			pr_info("%s: link up (%d/%s)\n",
 			       dev->name, phydev->speed,
 			       DUPLEX_FULL == phydev->duplex ? "Full":"Half");
			netdev_info(dev, "link up (%d/%s)\n",
				    phydev->speed,
				    phydev->duplex == DUPLEX_FULL ? "Full" : "Half");
 
quoted hunk ↗ jump to hunk
 		else
-			printk(KERN_INFO "%s: link down\n", dev->name);
+			pr_info("%s: link down\n", dev->name);
			netdev_info(dev, "link down\n");
quoted hunk ↗ jump to hunk
@@ -193,7 +194,7 @@ static int macb_mii_probe(struct net_device *dev)
 
 	phydev = phy_find_first(bp->mii_bus);
 	if (!phydev) {
-		printk (KERN_ERR "%s: no PHY found\n", dev->name);
+		pr_err("%s: no PHY found\n", dev->name);
		netdev_err(dev, "no PHY found\n");
quoted hunk ↗ jump to hunk
@@ -206,7 +207,7 @@ static int macb_mii_probe(struct net_device *dev)
 				 PHY_INTERFACE_MODE_RMII :
 				 PHY_INTERFACE_MODE_MII);
 	if (ret) {
-		printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name);
+		pr_err("%s: Could not attach to PHY\n", dev->name);
		netdev_err(dev, "could not attach to PHY\n");

etc...
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help