]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging/rtl8187se: Use pr_ printks in ieee80211/ieee80211_crypt.c
authorYAMANE Toshiaki <yamanetoshi@gmail.com>
Tue, 20 Nov 2012 12:10:57 +0000 (21:10 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 21 Nov 2012 21:59:59 +0000 (13:59 -0800)
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: YAMANE Toshiaki <yamanetoshi@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c

index 934b91598f26e64ee6ab903057682c25875a8787..623245c8cb240872917999ca935b285ad3c00cf6 100644 (file)
@@ -11,6 +11,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 //#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -66,8 +68,7 @@ void ieee80211_crypt_deinit_handler(unsigned long data)
        spin_lock_irqsave(&ieee->lock, flags);
        ieee80211_crypt_deinit_entries(ieee, 0);
        if (!list_empty(&ieee->crypt_deinit_list)) {
-               printk(KERN_DEBUG "%s: entries remaining in delayed crypt "
-                      "deletion list\n", ieee->dev->name);
+               pr_debug("entries remaining in delayed crypt deletion list\n");
                ieee->crypt_deinit_timer.expires = jiffies + HZ;
                add_timer(&ieee->crypt_deinit_timer);
        }
@@ -118,8 +119,7 @@ int ieee80211_register_crypto_ops(struct ieee80211_crypto_ops *ops)
        list_add(&alg->list, &hcrypt->algs);
        spin_unlock_irqrestore(&hcrypt->lock, flags);
 
-       printk(KERN_DEBUG "ieee80211_crypt: registered algorithm '%s'\n",
-              ops->name);
+       pr_debug("registered algorithm '%s'\n", ops->name);
 
        return 0;
 }
@@ -146,8 +146,7 @@ int ieee80211_unregister_crypto_ops(struct ieee80211_crypto_ops *ops)
        spin_unlock_irqrestore(&hcrypt->lock, flags);
 
        if (del_alg) {
-               printk(KERN_DEBUG "ieee80211_crypt: unregistered algorithm "
-                      "'%s'\n", ops->name);
+               pr_debug("unregistered algorithm '%s'\n", ops->name);
                kfree(del_alg);
        }
 
@@ -234,9 +233,8 @@ void ieee80211_crypto_deinit(void)
                alg = list_entry(ptr, struct ieee80211_crypto_alg, list);
                if (alg) {
                        list_del(ptr);
-                       printk(KERN_DEBUG
-                              "ieee80211_crypt: unregistered algorithm '%s' (deinit)\n",
-                              alg->ops->name);
+                       pr_debug("unregistered algorithm '%s' (deinit)\n",
+                                alg->ops->name);
                        kfree(alg);
                }
        }