From e9b801910f9ee5a5ee554cf5acff6fecfe62a5ad Mon Sep 17 00:00:00 2001 From: YAMANE Toshiaki Date: Wed, 21 Nov 2012 05:16:37 +0900 Subject: [PATCH] --- yaml --- r: 338060 b: refs/heads/master c: 545bb52ccd8008c113a002b7f7d5165aa6da5ee3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8187se/r8185b_init.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 37b0e4517b34..278cf6c0bb0e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ef68ab4dd8d16c10e7b36796f11b6a209acc1de +refs/heads/master: 545bb52ccd8008c113a002b7f7d5165aa6da5ee3 diff --git a/trunk/drivers/staging/rtl8187se/r8185b_init.c b/trunk/drivers/staging/rtl8187se/r8185b_init.c index 5c454fa861c8..28611c2f26e5 100644 --- a/trunk/drivers/staging/rtl8187se/r8185b_init.c +++ b/trunk/drivers/staging/rtl8187se/r8185b_init.c @@ -223,9 +223,10 @@ static bool HwHSSIThreeWire(struct net_device *dev, udelay(10); } if (TryCnt == TC_3W_POLL_MAX_TRY_CNT) { - printk(KERN_ERR "rtl8187se: HwThreeWire(): CmdReg:" - " %#X RE|WE bits are not clear!!\n", u1bTmp); - return false; + netdev_err(dev, + "HwThreeWire(): CmdReg: %#X RE|WE bits are not clear!!\n", + u1bTmp); + return false; } /* RTL8187S HSSI Read/Write Function */ @@ -419,7 +420,7 @@ void ZEBRA_Config_85BASIC_HardCode(struct net_device *dev) if (u4bRF23 == 0x818 && u4bRF24 == 0x70C) { d_cut = 1; - printk(KERN_INFO "rtl8187se: card type changed from C- to D-cut\n"); + netdev_info(dev, "card type changed from C- to D-cut\n"); } /* Page0 : reg0-reg15 */