aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/marvell
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2012-10-27 18:05:48 -0400
committerDavid S. Miller <davem@davemloft.net>2012-10-31 14:02:45 -0400
commitf7b4fb22b838f895ce9fa994f0ef4f7f541f5266 (patch)
tree9bdb3dad77666d5b68d4b9d100b1e225f59dd61b /drivers/net/ethernet/marvell
parent855ddb56d81fcdc76ab60b80062359ea09a1515d (diff)
ethernet: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
dev_<level> calls take less code than dev_printk(KERN_<LEVEL> and reducing object size is good. Coalesce formats for easier grep. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell')
-rw-r--r--drivers/net/ethernet/marvell/pxa168_eth.c7
1 files changed, 3 insertions, 4 deletions
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;