1 files changed, 11 insertions, 13 deletions

diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c
index b3882ae9d97..694eae3d4fd 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c
@@ -11,12 +11,14 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 //#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <asm/string.h>
-#include <asm/errno.h>
+#include <linux/string.h>
+#include <linux/errno.h>
 
 #include "ieee80211.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);
         }
 
@@ -155,7 +154,7 @@ int ieee80211_unregister_crypto_ops(struct ieee80211_crypto_ops *ops)
 }
 
 
-struct ieee80211_crypto_ops * ieee80211_get_crypto_ops(const char *name)
+struct ieee80211_crypto_ops *ieee80211_get_crypto_ops(const char *name)
 {
         unsigned long flags;
         struct list_head *ptr;
@@ -182,7 +181,7 @@ struct ieee80211_crypto_ops * ieee80211_get_crypto_ops(const char *name)
 }
 
 
-static void * ieee80211_crypt_null_init(int keyidx) { return (void *) 1; }
+static void *ieee80211_crypt_null_init(int keyidx) { return (void *) 1; }
 static void ieee80211_crypt_null_deinit(void *priv) {}
 
 static struct ieee80211_crypto_ops ieee80211_crypt_null = {
@@ -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);
                 }
         }