[PATCH 32/49] drivers/staging/rtl8187se: Convert printks to pr_<level>

Joe Perches joe at perches.com
Thu Oct 15 01:54:16 UTC 2009


Signed-off-by: Joe Perches <joe at perches.com>
---
 drivers/staging/rtl8187se/r8180.h       |    6 +++---
 drivers/staging/rtl8187se/r8180_core.c  |   20 ++++++++++----------
 drivers/staging/rtl8187se/r8180_wx.c    |    6 +++---
 drivers/staging/rtl8187se/r8185b_init.c |    2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/drivers/staging/rtl8187se/r8180.h b/drivers/staging/rtl8187se/r8180.h
index 8216d7e..7c23649 100644
--- a/drivers/staging/rtl8187se/r8180.h
+++ b/drivers/staging/rtl8187se/r8180.h
@@ -20,9 +20,9 @@
 
 
 #define RTL8180_MODULE_NAME "r8180"
-#define DMESG(x,a...) printk(KERN_INFO RTL8180_MODULE_NAME ": " x "\n", ## a)
-#define DMESGW(x,a...) printk(KERN_WARNING RTL8180_MODULE_NAME ": WW:" x "\n", ## a)
-#define DMESGE(x,a...) printk(KERN_WARNING RTL8180_MODULE_NAME ": EE:" x "\n", ## a)
+#define DMESG(x,a...) pr_info(RTL8180_MODULE_NAME ": " x "\n", ## a)
+#define DMESGW(x,a...) pr_warning(RTL8180_MODULE_NAME ": WW:" x "\n", ## a)
+#define DMESGE(x,a...) pr_warning(RTL8180_MODULE_NAME ": EE:" x "\n", ## a)
 
 #include <linux/module.h>
 #include <linux/kernel.h>
diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
index 53e654d..2349a33 100644
--- a/drivers/staging/rtl8187se/r8180_core.c
+++ b/drivers/staging/rtl8187se/r8180_core.c
@@ -132,8 +132,8 @@ static int rtl8180_resume(struct pci_dev *pdev)
 
 	err = pci_enable_device(pdev);
 	if (err) {
-		printk(KERN_ERR "%s: pci_enable_device failed on resume\n",
-				dev->name);
+		pr_err("%s: pci_enable_device failed on resume\n",
+		       dev->name);
 
 		return err;
 	}
@@ -2512,7 +2512,7 @@ void rtl8180_wmm_param_update(struct work_struct * work)
 						write_nic_dword(dev, AC_VO_PARAM, u4bAcParam);
 						break;
 					default:
-						printk(KERN_WARNING "SetHwReg8185():invalid ACI: %d!\n", eACI);
+						pr_warning("SetHwReg8185():invalid ACI: %d!\n", eACI);
 						break;
 				}
 			}
@@ -2551,7 +2551,7 @@ void rtl8180_wmm_param_update(struct work_struct * work)
 					write_nic_dword(dev, AC_VO_PARAM, u4bAcParam);
 					break;
 				default:
-					printk(KERN_WARNING "SetHwReg8185(): invalid ACI: %d !\n", eACI);
+					pr_warning("SetHwReg8185(): invalid ACI: %d !\n", eACI);
 					break;
 			}
 		}
@@ -4011,28 +4011,28 @@ static int __init rtl8180_pci_module_init(void)
 
 	ret = ieee80211_crypto_init();
 	if (ret) {
-		printk(KERN_ERR "ieee80211_crypto_init() failed %d\n", ret);
+		pr_err("ieee80211_crypto_init() failed %d\n", ret);
 		return ret;
 	}
 	ret = ieee80211_crypto_tkip_init();
 	if (ret) {
-		printk(KERN_ERR "ieee80211_crypto_tkip_init() failed %d\n", ret);
+		pr_err("ieee80211_crypto_tkip_init() failed %d\n", ret);
 		return ret;
 	}
 	ret = ieee80211_crypto_ccmp_init();
 	if (ret) {
-		printk(KERN_ERR "ieee80211_crypto_ccmp_init() failed %d\n", ret);
+		pr_err("ieee80211_crypto_ccmp_init() failed %d\n", ret);
 		return ret;
 	}
 	ret = ieee80211_crypto_wep_init();
 	if (ret) {
-		printk(KERN_ERR "ieee80211_crypto_wep_init() failed %d\n", ret);
+		pr_err("ieee80211_crypto_wep_init() failed %d\n", ret);
 		return ret;
 	}
 
-	printk(KERN_INFO "\nLinux kernel driver for RTL8180 \
+	pr_info("\nLinux kernel driver for RTL8180 \
 / RTL8185 based WLAN cards\n");
-	printk(KERN_INFO "Copyright (c) 2004-2005, Andrea Merello\n");
+	pr_info("Copyright (c) 2004-2005, Andrea Merello\n");
 	DMESG("Initializing module");
 	DMESG("Wireless extensions version %d", WIRELESS_EXT);
 	rtl8180_proc_module_init();
diff --git a/drivers/staging/rtl8187se/r8180_wx.c b/drivers/staging/rtl8187se/r8180_wx.c
index 766892e..653a524 100644
--- a/drivers/staging/rtl8187se/r8180_wx.c
+++ b/drivers/staging/rtl8187se/r8180_wx.c
@@ -955,16 +955,16 @@ static int r8180_wx_set_iwmode(struct net_device *dev,
 	if (*param == 1) {
 		modulation |= IEEE80211_CCK_MODULATION;
 		mode = IEEE_B;
-	printk(KERN_INFO "B mode!\n");
+		pr_info("B mode!\n");
 	} else if (*param == 2) {
 		modulation |= IEEE80211_OFDM_MODULATION;
 		mode = IEEE_G;
-	printk(KERN_INFO "G mode!\n");
+		pr_info("G mode!\n");
 	} else if (*param == 3) {
 		modulation |= IEEE80211_CCK_MODULATION;
 		modulation |= IEEE80211_OFDM_MODULATION;
 		mode = IEEE_B|IEEE_G;
-	printk(KERN_INFO "B/G mode!\n");
+		pr_info("B/G mode!\n");
 	}
 
 	if(ieee->proto_started) {
diff --git a/drivers/staging/rtl8187se/r8185b_init.c b/drivers/staging/rtl8187se/r8185b_init.c
index cd07059..044d965 100644
--- a/drivers/staging/rtl8187se/r8185b_init.c
+++ b/drivers/staging/rtl8187se/r8185b_init.c
@@ -1833,7 +1833,7 @@ ActUpdateChannelAccessSetting(
 						}
 					}
 
-					//printk(KERN_WARNING "SetHwReg8185(): [HW_VAR_ACM_CTRL] Write 0x%X\n", AcmCtrl);
+					//pr_warning("SetHwReg8185(): [HW_VAR_ACM_CTRL] Write 0x%X\n", AcmCtrl);
 
 #ifdef TO_DO
 					pHalData->AcmControl = AcmCtrl;
-- 
1.6.5.rc3.dirty




More information about the devel mailing list