aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ethernet/chelsio/cxgb3/common.h7
-rw-r--r--drivers/net/ethernet/marvell/pxa168_eth.c7
2 files changed, 6 insertions, 8 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb3/common.h b/drivers/net/ethernet/chelsio/cxgb3/common.h
index df01b6343241..8c82248ce416 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/common.h
+++ b/drivers/net/ethernet/chelsio/cxgb3/common.h
@@ -42,10 +42,9 @@
42#include <linux/mdio.h> 42#include <linux/mdio.h>
43#include "version.h" 43#include "version.h"
44 44
45#define CH_ERR(adap, fmt, ...) dev_err(&adap->pdev->dev, fmt, ## __VA_ARGS__) 45#define CH_ERR(adap, fmt, ...) dev_err(&adap->pdev->dev, fmt, ##__VA_ARGS__)
46#define CH_WARN(adap, fmt, ...) dev_warn(&adap->pdev->dev, fmt, ## __VA_ARGS__) 46#define CH_WARN(adap, fmt, ...) dev_warn(&adap->pdev->dev, fmt, ##__VA_ARGS__)
47#define CH_ALERT(adap, fmt, ...) \ 47#define CH_ALERT(adap, fmt, ...) dev_alert(&adap->pdev->dev, fmt, ##__VA_ARGS__)
48 dev_printk(KERN_ALERT, &adap->pdev->dev, fmt, ## __VA_ARGS__)
49 48
50/* 49/*
51 * More powerful macro that selectively prints messages based on msg_enable. 50 * More powerful macro that selectively prints messages based on msg_enable.
diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c
index 59489722e898..10d678d3dd01 100644
--- a/drivers/net/ethernet/marvell/pxa168_eth.c
+++ b/drivers/net/ethernet/marvell/pxa168_eth.c
@@ -1131,7 +1131,7 @@ static int pxa168_eth_open(struct net_device *dev)
1131 err = request_irq(dev->irq, pxa168_eth_int_handler, 1131 err = request_irq(dev->irq, pxa168_eth_int_handler,
1132 IRQF_DISABLED, dev->name, dev); 1132 IRQF_DISABLED, dev->name, dev);
1133 if (err) { 1133 if (err) {
1134 dev_printk(KERN_ERR, &dev->dev, "can't assign irq\n"); 1134 dev_err(&dev->dev, "can't assign irq\n");
1135 return -EAGAIN; 1135 return -EAGAIN;
1136 } 1136 }
1137 pep->rx_resource_err = 0; 1137 pep->rx_resource_err = 0;
@@ -1201,9 +1201,8 @@ static int pxa168_eth_change_mtu(struct net_device *dev, int mtu)
1201 */ 1201 */
1202 pxa168_eth_stop(dev); 1202 pxa168_eth_stop(dev);
1203 if (pxa168_eth_open(dev)) { 1203 if (pxa168_eth_open(dev)) {
1204 dev_printk(KERN_ERR, &dev->dev, 1204 dev_err(&dev->dev,
1205 "fatal error on re-opening device after " 1205 "fatal error on re-opening device after MTU change\n");
1206 "MTU change\n");
1207 } 1206 }
1208 1207
1209 return 0; 1208 return 0;