Commit 3bba8b96 authored by YAMANE Toshiaki's avatar YAMANE Toshiaki Committed by Greg Kroah-Hartman

staging/rtl8187se: Use pr_ printks in ieee80211/ieee80211_crypt.c

The following warnings fixed.
- WARNING: Prefer netdev_dbg(netdev, ... then dev_dbg(dev, ... then pr_debug(...  to printk(KERN_DEBUG ...

and add pr_fmt.
Signed-off-by: default avatarYAMANE Toshiaki <yamanetoshi@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a16f3eb1
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
* *
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
//#include <linux/config.h> //#include <linux/config.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
...@@ -66,8 +68,7 @@ void ieee80211_crypt_deinit_handler(unsigned long data) ...@@ -66,8 +68,7 @@ void ieee80211_crypt_deinit_handler(unsigned long data)
spin_lock_irqsave(&ieee->lock, flags); spin_lock_irqsave(&ieee->lock, flags);
ieee80211_crypt_deinit_entries(ieee, 0); ieee80211_crypt_deinit_entries(ieee, 0);
if (!list_empty(&ieee->crypt_deinit_list)) { if (!list_empty(&ieee->crypt_deinit_list)) {
printk(KERN_DEBUG "%s: entries remaining in delayed crypt " pr_debug("entries remaining in delayed crypt deletion list\n");
"deletion list\n", ieee->dev->name);
ieee->crypt_deinit_timer.expires = jiffies + HZ; ieee->crypt_deinit_timer.expires = jiffies + HZ;
add_timer(&ieee->crypt_deinit_timer); add_timer(&ieee->crypt_deinit_timer);
} }
...@@ -118,8 +119,7 @@ int ieee80211_register_crypto_ops(struct ieee80211_crypto_ops *ops) ...@@ -118,8 +119,7 @@ int ieee80211_register_crypto_ops(struct ieee80211_crypto_ops *ops)
list_add(&alg->list, &hcrypt->algs); list_add(&alg->list, &hcrypt->algs);
spin_unlock_irqrestore(&hcrypt->lock, flags); spin_unlock_irqrestore(&hcrypt->lock, flags);
printk(KERN_DEBUG "ieee80211_crypt: registered algorithm '%s'\n", pr_debug("registered algorithm '%s'\n", ops->name);
ops->name);
return 0; return 0;
} }
...@@ -146,8 +146,7 @@ int ieee80211_unregister_crypto_ops(struct ieee80211_crypto_ops *ops) ...@@ -146,8 +146,7 @@ int ieee80211_unregister_crypto_ops(struct ieee80211_crypto_ops *ops)
spin_unlock_irqrestore(&hcrypt->lock, flags); spin_unlock_irqrestore(&hcrypt->lock, flags);
if (del_alg) { if (del_alg) {
printk(KERN_DEBUG "ieee80211_crypt: unregistered algorithm " pr_debug("unregistered algorithm '%s'\n", ops->name);
"'%s'\n", ops->name);
kfree(del_alg); kfree(del_alg);
} }
...@@ -234,8 +233,7 @@ void ieee80211_crypto_deinit(void) ...@@ -234,8 +233,7 @@ void ieee80211_crypto_deinit(void)
alg = list_entry(ptr, struct ieee80211_crypto_alg, list); alg = list_entry(ptr, struct ieee80211_crypto_alg, list);
if (alg) { if (alg) {
list_del(ptr); list_del(ptr);
printk(KERN_DEBUG pr_debug("unregistered algorithm '%s' (deinit)\n",
"ieee80211_crypt: unregistered algorithm '%s' (deinit)\n",
alg->ops->name); alg->ops->name);
kfree(alg); kfree(alg);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment