Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751753AbbEIWiB (ORCPT ); Sat, 9 May 2015 18:38:01 -0400 Received: from smtprelay0106.hostedemail.com ([216.40.44.106]:58391 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750951AbbEIWh7 (ORCPT ); Sat, 9 May 2015 18:37:59 -0400 X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,joe@perches.com,:::::::::,RULES_HIT:41:355:379:541:599:960:973:988:989:1260:1277:1311:1313:1314:1345:1359:1373:1437:1515:1516:1518:1534:1542:1593:1594:1711:1730:1747:1777:1792:2194:2199:2393:2559:2562:2828:3138:3139:3140:3141:3142:3353:3622:3865:3866:3867:3868:3870:3872:3874:4250:4321:4605:5007:6119:6261:10004:10400:10848:11026:11232:11473:11658:11914:12043:12295:12296:12438:12517:12519:12740:13019:13095:13132:13231:21080,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0 X-HE-Tag: mind96_b30b66ebb03d X-Filterd-Recvd-Size: 3316 Message-ID: <1431211075.22450.83.camel@perches.com> Subject: Re: [PATCH v3 20/33] staging: rtl8192e: Fix PREFER_PR_LEVEL warnings From: Joe Perches To: Mateusz Kulikowski Cc: gregkh@linuxfoundation.org, dan.carpenter@oracle.com, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Date: Sat, 09 May 2015 15:37:55 -0700 In-Reply-To: <1431206361-13736-21-git-send-email-mateusz.kulikowski@gmail.com> References: <1431206361-13736-1-git-send-email-mateusz.kulikowski@gmail.com> <1431206361-13736-21-git-send-email-mateusz.kulikowski@gmail.com> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.12.11-0ubuntu3 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2530 Lines: 63 On Sat, 2015-05-09 at 23:19 +0200, Mateusz Kulikowski wrote: > Fix most of remaining PREFER_PR_LEVEL warnings in rtllib. > Replace printk() with netdev_* if possible, pr_* in other cases. > All pr_* use __func__ to easily trace message back to rtllib It's more common to use %s: and not %s(): but it's generally even better not to use these at all and use dynamic_debug to add the function name when desired. > diff --git a/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c b/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c [] > @@ -69,7 +69,7 @@ static void *rtllib_ccmp_init(int key_idx) > > priv->tfm = (void *)crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC); > if (IS_ERR(priv->tfm)) { > - pr_debug("rtllib_crypt_ccmp: could not allocate crypto API aes\n"); > + pr_debug("%s(): could not allocate crypto API aes\n", __func__); > priv->tfm = NULL; > goto fail; > } > diff --git a/drivers/staging/rtl8192e/rtllib_crypt_tkip.c b/drivers/staging/rtl8192e/rtllib_crypt_tkip.c [] > @@ -630,12 +623,10 @@ static int rtllib_michael_mic_verify(struct sk_buff *skb, int keyidx, > struct rtllib_hdr_4addr *hdr; > > hdr = (struct rtllib_hdr_4addr *) skb->data; > - printk(KERN_DEBUG > - "%s: Michael MIC verification failed for MSDU from %pM keyidx=%d\n", > - skb->dev ? skb->dev->name : "N/A", hdr->addr2, > - keyidx); > - printk(KERN_DEBUG "%d\n", > - memcmp(mic, skb->data + skb->len - 8, 8) != 0); > + pr_debug("%s: Michael MIC verification failed for MSDU from %pM keyidx=%d\n", > + skb->dev ? skb->dev->name : "N/A", hdr->addr2, > + keyidx); Not that it's necessary, but are this and below missing __func__? > diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c [] > @@ -346,8 +346,9 @@ rtllib_rx_frame_decrypt_msdu(struct rtllib_device *ieee, struct sk_buff *skb, > res = crypt->ops->decrypt_msdu(skb, keyidx, hdrlen, crypt->priv); > atomic_dec(&crypt->refcnt); > if (res < 0) { > - printk(KERN_DEBUG "%s: MSDU decryption/MIC verification failed (SA= %pM keyidx=%d)\n", > - ieee->dev->name, hdr->addr2, keyidx); > + netdev_dbg(ieee->dev, > + "MSDU decryption/MIC verification failed (SA= %pM keyidx=%d)\n", > + hdr->addr2, keyidx); > return -1; > } > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/