From af03d09a32dde494798000a31e21112632a866a9 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Wed, 20 Mar 2013 22:46:55 +0000 Subject: [PATCH] --- yaml --- r: 368585 b: refs/heads/master c: 14c3326a111b948cabc35d523a43a1e6663f6091 h: refs/heads/master i: 368583: 49724dfa554dba0d80b159f78b13bf8f5494cfd8 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/renesas/sh_eth.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4d317235f488..b7ce4aec1ba3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4021db9a0daa42ff72570f7b0375d195e528f73f +refs/heads/master: 14c3326a111b948cabc35d523a43a1e6663f6091 diff --git a/trunk/drivers/net/ethernet/renesas/sh_eth.c b/trunk/drivers/net/ethernet/renesas/sh_eth.c index 56884c4cd90b..f632085e69b4 100644 --- a/trunk/drivers/net/ethernet/renesas/sh_eth.c +++ b/trunk/drivers/net/ethernet/renesas/sh_eth.c @@ -592,7 +592,7 @@ static int sh_eth_check_reset(struct net_device *ndev) cnt--; } if (cnt < 0) { - printk(KERN_ERR "Device reset fail\n"); + pr_err("Device reset fail\n"); ret = -ETIMEDOUT; } return ret; @@ -2321,7 +2321,7 @@ static const u16 *sh_eth_get_register_offset(int register_type) reg_offset = sh_eth_offset_fast_sh3_sh2; break; default: - printk(KERN_ERR "Unknown register type (%d)\n", register_type); + pr_err("Unknown register type (%d)\n", register_type); break; }