]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
staging: rtl8192u: Replace printk() with more standardize output format.
authorArushi Singhal <arushisinghal19971997@gmail.com>
Wed, 7 Mar 2018 10:39:09 +0000 (16:09 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 8 Mar 2018 17:56:15 +0000 (09:56 -0800)
printk() is the raw way to print output and should be avoided.

For drivers with defined "struct device object", dev_*macro() is
prefer and for "struct netdevice object", netdev_*macro() is prefer over
dev_*macro() to standardize the output format within the subsystem.

If no "struct device object" is defined prefer pr_*macro() over printk().

This patch Replace printk having a log level with the appropriate output
format according to the order of preference.

Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c

index e6648f7723ce928a37663dc691c7d38daf3ac2e1..a4b40422e5bd13dbd81dbc7dc9af96194ca326a7 100644 (file)
@@ -73,7 +73,7 @@ static void *ieee80211_ccmp_init(int key_idx)
 
        priv->tfm = (void *)crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC);
        if (IS_ERR(priv->tfm)) {
-               printk(KERN_DEBUG "ieee80211_crypt_ccmp: could not allocate crypto API aes\n");
+               pr_debug("ieee80211_crypt_ccmp: could not allocate crypto API aes\n");
                priv->tfm = NULL;
                goto fail;
        }
@@ -276,22 +276,22 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
        keyidx = pos[3];
        if (!(keyidx & (1 << 5))) {
                if (net_ratelimit()) {
-                       printk(KERN_DEBUG "CCMP: received packet without ExtIV flag from %pM\n",
-                               hdr->addr2);
+                       netdev_dbg(skb->dev, "CCMP: received packet without ExtIV flag from %pM\n",
+                                  hdr->addr2);
                }
                key->dot11RSNAStatsCCMPFormatErrors++;
                return -2;
        }
        keyidx >>= 6;
        if (key->key_idx != keyidx) {
-               printk(KERN_DEBUG "CCMP: RX tkey->key_idx=%d frame keyidx=%d priv=%p\n",
-                       key->key_idx, keyidx, priv);
+               netdev_dbg(skb->dev, "CCMP: RX tkey->key_idx=%d frame keyidx=%d priv=%p\n",
+                          key->key_idx, keyidx, priv);
                return -6;
        }
        if (!key->key_set) {
                if (net_ratelimit()) {
-                       printk(KERN_DEBUG "CCMP: received packet from %pM with keyid=%d that does not have a configured key\n",
-                               hdr->addr2, keyidx);
+                       netdev_dbg(skb->dev, "CCMP: received packet from %pM with keyid=%d that does not have a configured key\n",
+                                  hdr->addr2, keyidx);
                }
                return -3;
        }
@@ -306,8 +306,8 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
 
        if (memcmp(pn, key->rx_pn, CCMP_PN_LEN) <= 0) {
                if (net_ratelimit()) {
-                       printk(KERN_DEBUG "CCMP: replay detected: STA=%pM previous PN %pm received PN %pm\n",
-                              hdr->addr2, key->rx_pn, pn);
+                       netdev_dbg(skb->dev, "CCMP: replay detected: STA=%pM previous PN %pm received PN %pm\n",
+                                  hdr->addr2, key->rx_pn, pn);
                }
                key->dot11RSNAStatsCCMPReplays++;
                return -4;
@@ -341,8 +341,8 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
 
                if (memcmp(mic, a, CCMP_MIC_LEN) != 0) {
                        if (net_ratelimit()) {
-                               printk(KERN_DEBUG "CCMP: decrypt failed: STA=%pM\n",
-                                       hdr->addr2);
+                               netdev_dbg(skb->dev, "CCMP: decrypt failed: STA=%pM\n",
+                                          hdr->addr2);
                        }
                        key->dot11RSNAStatsCCMPDecryptErrors++;
                        return -5;