From 6311b3449b488d82466cd321fb4a7222c1908061 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Sat, 27 Oct 2012 22:05:48 +0000
Subject: [PATCH] --- yaml --- r: 340549 b: refs/heads/master c:
 f7b4fb22b838f895ce9fa994f0ef4f7f541f5266 h: refs/heads/master i:   340547:
 f5d4afdc137777184d66f4b885cad78f0ae4034d v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/net/ethernet/chelsio/cxgb3/common.h | 7 +++----
 trunk/drivers/net/ethernet/marvell/pxa168_eth.c   | 7 +++----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index a83649e605a9..60b0b925e87e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 855ddb56d81fcdc76ab60b80062359ea09a1515d
+refs/heads/master: f7b4fb22b838f895ce9fa994f0ef4f7f541f5266
diff --git a/trunk/drivers/net/ethernet/chelsio/cxgb3/common.h b/trunk/drivers/net/ethernet/chelsio/cxgb3/common.h
index df01b6343241..8c82248ce416 100644
--- a/trunk/drivers/net/ethernet/chelsio/cxgb3/common.h
+++ b/trunk/drivers/net/ethernet/chelsio/cxgb3/common.h
@@ -42,10 +42,9 @@
 #include <linux/mdio.h>
 #include "version.h"
 
-#define CH_ERR(adap, fmt, ...)   dev_err(&adap->pdev->dev, fmt, ## __VA_ARGS__)
-#define CH_WARN(adap, fmt, ...)  dev_warn(&adap->pdev->dev, fmt, ## __VA_ARGS__)
-#define CH_ALERT(adap, fmt, ...) \
-	dev_printk(KERN_ALERT, &adap->pdev->dev, fmt, ## __VA_ARGS__)
+#define CH_ERR(adap, fmt, ...)   dev_err(&adap->pdev->dev, fmt, ##__VA_ARGS__)
+#define CH_WARN(adap, fmt, ...)  dev_warn(&adap->pdev->dev, fmt, ##__VA_ARGS__)
+#define CH_ALERT(adap, fmt, ...) dev_alert(&adap->pdev->dev, fmt, ##__VA_ARGS__)
 
 /*
  * More powerful macro that selectively prints messages based on msg_enable.
diff --git a/trunk/drivers/net/ethernet/marvell/pxa168_eth.c b/trunk/drivers/net/ethernet/marvell/pxa168_eth.c
index 59489722e898..10d678d3dd01 100644
--- a/trunk/drivers/net/ethernet/marvell/pxa168_eth.c
+++ b/trunk/drivers/net/ethernet/marvell/pxa168_eth.c
@@ -1131,7 +1131,7 @@ static int pxa168_eth_open(struct net_device *dev)
 	err = request_irq(dev->irq, pxa168_eth_int_handler,
 			  IRQF_DISABLED, dev->name, dev);
 	if (err) {
-		dev_printk(KERN_ERR, &dev->dev, "can't assign irq\n");
+		dev_err(&dev->dev, "can't assign irq\n");
 		return -EAGAIN;
 	}
 	pep->rx_resource_err = 0;
@@ -1201,9 +1201,8 @@ static int pxa168_eth_change_mtu(struct net_device *dev, int mtu)
 	 */
 	pxa168_eth_stop(dev);
 	if (pxa168_eth_open(dev)) {
-		dev_printk(KERN_ERR, &dev->dev,
-			   "fatal error on re-opening device after "
-			   "MTU change\n");
+		dev_err(&dev->dev,
+			"fatal error on re-opening device after MTU change\n");
 	}
 
 	return 0;