Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
---
drivers/staging/rtl8192e/ieee80211.h | 4 ++--
drivers/staging/rtl8192e/r8192E.h | 6 +++---
drivers/staging/rtl8192e/r8192E_core.c | 4 ++--
drivers/staging/rtl8192e/r8192_pm.c | 8 ++++----
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/rtl8192e/ieee80211.h b/drivers/staging/rtl8192e/ieee80211.h
index 97137dd..1fdfed8 100644
--- a/drivers/staging/rtl8192e/ieee80211.h
+++ b/drivers/staging/rtl8192e/ieee80211.h
@@ -598,8 +598,8 @@ do { if (ieee80211_debug_level & (level)) \
#define IEEE80211_DL_TRACE (1<<29) //trace function, need to user net_ratelimit() together in order not to print too much to the screen
#define IEEE80211_DL_DATA (1<<30) //use this flag to control whether print data buf out.
#define IEEE80211_DL_ERR (1<<31) //always open
-#define IEEE80211_ERROR(f, a...) printk(KERN_ERR "ieee80211: " f, ## a)
-#define IEEE80211_WARNING(f, a...) printk(KERN_WARNING "ieee80211: " f, ## a)
+#define IEEE80211_ERROR(f, a...) pr_err("ieee80211: " f, ## a)
+#define IEEE80211_WARNING(f, a...) pr_warning("ieee80211: " f, ## a)
#define IEEE80211_DEBUG_INFO(f, a...) IEEE80211_DEBUG(IEEE80211_DL_INFO, f, ## a)
#define IEEE80211_DEBUG_WX(f, a...) IEEE80211_DEBUG(IEEE80211_DL_WX, f, ## a)
diff --git a/drivers/staging/rtl8192e/r8192E.h b/drivers/staging/rtl8192e/r8192E.h
index 61b6f25..713ae12 100644
--- a/drivers/staging/rtl8192e/r8192E.h
+++ b/drivers/staging/rtl8192e/r8192E.h
@@ -93,9 +93,9 @@
#define IC_VersionCut_E 0x4
#if 0 //we need to use RT_TRACE instead DMESG as RT_TRACE will clearly show debug level wb.
-#define DMESG(x,a...) printk(KERN_INFO RTL819xE_MODULE_NAME ": " x "\n", ## a)
-#define DMESGW(x,a...) printk(KERN_WARNING RTL819xE_MODULE_NAME ": WW:" x "\n", ## a)
-#define DMESGE(x,a...) printk(KERN_WARNING RTL819xE_MODULE_NAME ": EE:" x "\n", ## a)
+#define DMESG(x,a...) pr_info(RTL819xE_MODULE_NAME ": " x "\n", ## a)
+#define DMESGW(x,a...) pr_warning(RTL819xE_MODULE_NAME ": WW:" x "\n", ## a)
+#define DMESGE(x,a...) pr_warning(RTL819xE_MODULE_NAME ": EE:" x "\n", ## a)
#else
#define DMESG(x,a...)
#define DMESGW(x,a...)
diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c
index b0802a7..9f06633 100644
--- a/drivers/staging/rtl8192e/r8192E_core.c
+++ b/drivers/staging/rtl8192e/r8192E_core.c
@@ -6132,8 +6132,8 @@ static int __init rtl8192_pci_module_init(void)
if (retval)
return retval;
- 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/rtl8192e/r8192_pm.c b/drivers/staging/rtl8192e/r8192_pm.c
index feef29b..6afd8c5 100644
--- a/drivers/staging/rtl8192e/r8192_pm.c
+++ b/drivers/staging/rtl8192e/r8192_pm.c
@@ -18,7 +18,7 @@
int rtl8192E_save_state (struct pci_dev *dev, pm_message_t state)
{
- printk(KERN_NOTICE "r8192E save state call (state %u).\n", state.event);
+ pr_notice("r8192E save state call (state %u).\n", state.event);
return(-EAGAIN);
}
@@ -125,8 +125,8 @@ int rtl8192E_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;
}
@@ -164,7 +164,7 @@ out:
int rtl8192E_enable_wake (struct pci_dev *dev, pm_message_t state, int enable)
{
- printk(KERN_NOTICE "r8192E enable wake call (state %u, enable %d).\n",
+ pr_notice("r8192E enable wake call (state %u, enable %d).\n",
state.event, enable);
return(-EAGAIN);
}
--
1.6.5.rc3.dirty
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
