[PATCH 36/49] drivers/staging/rtl8192su: Convert printks to pr_<level>

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
---
 drivers/staging/rtl8192su/r8192U_core.c |   22 +++++++++++-----------
 drivers/staging/rtl8192su/r8192U_pm.c   |    8 ++++----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/drivers/staging/rtl8192su/r8192U_core.c b/drivers/staging/rtl8192su/r8192U_core.c
index 66274d7..2bf25a3 100644
--- a/drivers/staging/rtl8192su/r8192U_core.c
+++ b/drivers/staging/rtl8192su/r8192U_core.c
@@ -492,7 +492,7 @@ u32 read_nic_dword(struct net_device *dev, int indx)
 			       RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
 			       indx, 0, &data, 4, HZ / 2);
 //	if(0 != result) {
-//	  printk(KERN_WARNING "read size of data = %d\, date = %d\n", result, data);
+//	  pr_warning("read size of data = %d\, date = %d\n", result, data);
 //	}
 
         if (status < 0)
@@ -1402,7 +1402,7 @@ void rtl8192_rtx_disable(struct net_device *dev)
 	}
 
 	if (skb_queue_len(&priv->skb_queue)) {
-		printk(KERN_WARNING "skb_queue not empty\n");
+		pr_warning("skb_queue not empty\n");
 	}
 
 	skb_queue_purge(&priv->skb_queue);
@@ -7552,38 +7552,38 @@ static int __init rtl8192_usb_module_init(void)
 #ifdef CONFIG_IEEE80211_DEBUG
 	ret = ieee80211_debug_init();
 	if (ret) {
-		printk(KERN_ERR "ieee80211_debug_init() failed %d\n", ret);
+		pr_err("ieee80211_debug_init() failed %d\n", ret);
 		return ret;
 	}
 #endif
 	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 RTL8192 based WLAN cards\n");
-	printk(KERN_INFO "Copyright (c) 2007-2008, Realsil Wlan\n");
+	pr_info("\nLinux kernel driver for RTL8192 based WLAN cards\n");
+	pr_info("Copyright (c) 2007-2008, Realsil Wlan\n");
 	RT_TRACE(COMP_INIT, "Initializing module");
 	RT_TRACE(COMP_INIT, "Wireless extensions version %d", WIRELESS_EXT);
 	rtl8192_proc_module_init();
diff --git a/drivers/staging/rtl8192su/r8192U_pm.c b/drivers/staging/rtl8192su/r8192U_pm.c
index 60d739b..5d7b0d3 100644
--- a/drivers/staging/rtl8192su/r8192U_pm.c
+++ b/drivers/staging/rtl8192su/r8192U_pm.c
@@ -15,7 +15,7 @@
 /*****************************************************************************/
 int rtl8192U_save_state (struct pci_dev *dev, u32 state)
 {
-	printk(KERN_NOTICE "r8192U save state call (state %u).\n", state);
+	pr_notice("r8192U save state call (state %u).\n", state);
 	return(-EAGAIN);
 }
 
@@ -27,7 +27,7 @@ int rtl8192U_suspend(struct usb_interface *intf, pm_message_t state)
 
 	if(dev) {
 		 if (!netif_running(dev)) {
-		      printk(KERN_WARNING "netif not running, go out suspend function\n");
+			 pr_warning("netif not running, go out suspend function\n");
 		      return 0;
 		 }
 
@@ -50,7 +50,7 @@ int rtl8192U_resume (struct usb_interface *intf)
 
 	if(dev) {
 		if (!netif_running(dev)){
-			printk(KERN_WARNING "netif not running, go out resume function\n");
+			pr_warning("netif not running, go out resume function\n");
 			return 0;
 		}
 
@@ -65,7 +65,7 @@ int rtl8192U_resume (struct usb_interface *intf)
 
 int rtl8192U_enable_wake (struct pci_dev *dev, u32 state, int enable)
 {
-	printk(KERN_NOTICE "r8192U enable wake call (state %u, enable %d).\n",
+	pr_notice("r8192U enable wake call (state %u, enable %d).\n",
 			state, enable);
 	return(-EAGAIN);
 }
-- 
1.6.5.rc3.dirty

_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel

[Index of Archives]     [Linux Driver Backports]     [DMA Engine]     [Linux GPIO]     [Linux SPI]     [Video for Linux]     [Linux USB Devel]     [Linux Coverity]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux