* [PATCH v4 1/4] staging: rtl8192u: Convert from printk into netdev_dbg or pr_debug
2015-02-26 7:08 [PATCH v4 0/4] staging: rtl8192u: Fix warnings in ieee80211_crypt.c Navya Sri Nizamkari
@ 2015-02-26 7:13 ` Navya Sri Nizamkari
2015-02-26 21:47 ` [Outreachy kernel] " Greg KH
2015-02-26 7:19 ` [PATCH v4 2/4] staging: rtl8192u: Remove unnecessary comment Navya Sri Nizamkari
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Navya Sri Nizamkari @ 2015-02-26 7:13 UTC (permalink / raw)
To: outreachy-kernel
As this is a network driver file, convert printk(KERN_DEBUG.. ) to
netdev_dbg if the calling function has arguments to support it else
to pr_debug , to fix the checkpatch.pl warning:
WARNING: Prefer netdev_dbg(netdev, ... then dev_dbg(dev, ... then
pr_debug(... to printk(KERN_DEBUG ...
Signed-off-by: Navya Sri Nizamkari <navyasri.tech@gmail.com>
---
Changes in v4:
- Changed code indentation.
Changes in v3:
- Change pr_dbg to pr_debug as it gives the following warning:
implicit declaration of function ‘pr_dbg’and change
subject name to reflect the change.
Changes in v2:
- Correct the commit message to be clearer.
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c
index 5533221..eb89321 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c
@@ -66,8 +66,8 @@ 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);
+ netdev_dbg(ieee->dev, "entries remaining in delayed crypt "
+ "deletion list\n");
ieee->crypt_deinit_timer.expires = jiffies + HZ;
add_timer(&ieee->crypt_deinit_timer);
}
@@ -118,7 +118,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",
+ pr_debug("ieee80211_crypt: registered algorithm '%s'\n",
ops->name);
return 0;
@@ -146,7 +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 "
+ pr_debug("ieee80211_crypt: unregistered algorithm "
"'%s'\n", ops->name);
kfree(del_alg);
}
@@ -232,7 +232,7 @@ void __exit ieee80211_crypto_deinit(void)
struct ieee80211_crypto_alg *alg =
(struct ieee80211_crypto_alg *) ptr;
list_del(ptr);
- printk(KERN_DEBUG "ieee80211_crypt: unregistered algorithm "
+ pr_debug("ieee80211_crypt: unregistered algorithm "
"'%s' (deinit)\n", alg->ops->name);
kfree(alg);
}
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [Outreachy kernel] [PATCH v4 1/4] staging: rtl8192u: Convert from printk into netdev_dbg or pr_debug
2015-02-26 7:13 ` [PATCH v4 1/4] staging: rtl8192u: Convert from printk into netdev_dbg or pr_debug Navya Sri Nizamkari
@ 2015-02-26 21:47 ` Greg KH
0 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2015-02-26 21:47 UTC (permalink / raw)
To: Navya Sri Nizamkari; +Cc: outreachy-kernel
On Thu, Feb 26, 2015 at 12:43:43PM +0530, Navya Sri Nizamkari wrote:
> As this is a network driver file, convert printk(KERN_DEBUG.. ) to
> netdev_dbg if the calling function has arguments to support it else
> to pr_debug , to fix the checkpatch.pl warning:
>
> WARNING: Prefer netdev_dbg(netdev, ... then dev_dbg(dev, ... then
> pr_debug(... to printk(KERN_DEBUG ...
>
> Signed-off-by: Navya Sri Nizamkari <navyasri.tech@gmail.com>
> ---
> Changes in v4:
> - Changed code indentation.
>
> Changes in v3:
> - Change pr_dbg to pr_debug as it gives the following warning:
> implicit declaration of function ‘pr_dbg’and change
> subject name to reflect the change.
>
> Changes in v2:
> - Correct the commit message to be clearer.
>
> drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c
> index 5533221..eb89321 100644
> --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c
> +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c
> @@ -66,8 +66,8 @@ 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);
> + netdev_dbg(ieee->dev, "entries remaining in delayed crypt "
> + "deletion list\n");
This patch doesn't apply anymore to my tree :(
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v4 2/4] staging: rtl8192u: Remove unnecessary comment.
2015-02-26 7:08 [PATCH v4 0/4] staging: rtl8192u: Fix warnings in ieee80211_crypt.c Navya Sri Nizamkari
2015-02-26 7:13 ` [PATCH v4 1/4] staging: rtl8192u: Convert from printk into netdev_dbg or pr_debug Navya Sri Nizamkari
@ 2015-02-26 7:19 ` Navya Sri Nizamkari
2015-02-26 7:21 ` [PATCH v4 3/4] staging: rtl8192u: Replace asm header files with linux ones Navya Sri Nizamkari
2015-02-26 7:24 ` [PATCH v4 4/4] staging: rtl8192u: Fix quoted string split across lines Navya Sri Nizamkari
3 siblings, 0 replies; 6+ messages in thread
From: Navya Sri Nizamkari @ 2015-02-26 7:19 UTC (permalink / raw)
To: outreachy-kernel
The <linux/config.h> header file is not used anymore,
so it is commented out in this file.This patch deletes
that unnecessary comment.
Signed-off-by: Navya Sri Nizamkari <navyasri.tech@gmail.com>
---
Changes in v4:
-In v3 I sent the wrong patch, so sending the right one in this.
Changes in v3:
-Sent wrong patch(version v1 of the patch).
Changes in v2:
-Removed an unnecessary commented header.
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c
index eb89321..971fbe6 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c
@@ -11,7 +11,6 @@
*
*/
-//#include <linux/config.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/slab.h>
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v4 3/4] staging: rtl8192u: Replace asm header files with linux ones.
2015-02-26 7:08 [PATCH v4 0/4] staging: rtl8192u: Fix warnings in ieee80211_crypt.c Navya Sri Nizamkari
2015-02-26 7:13 ` [PATCH v4 1/4] staging: rtl8192u: Convert from printk into netdev_dbg or pr_debug Navya Sri Nizamkari
2015-02-26 7:19 ` [PATCH v4 2/4] staging: rtl8192u: Remove unnecessary comment Navya Sri Nizamkari
@ 2015-02-26 7:21 ` Navya Sri Nizamkari
2015-02-26 7:24 ` [PATCH v4 4/4] staging: rtl8192u: Fix quoted string split across lines Navya Sri Nizamkari
3 siblings, 0 replies; 6+ messages in thread
From: Navya Sri Nizamkari @ 2015-02-26 7:21 UTC (permalink / raw)
To: outreachy-kernel
As asm header files are included in linux header files, this patch
uses <linux/string.h> instead of <asm/string.h> and <linux/errno.h>
instead of <asm/errno.h> to fix checkpatch.pl errors:
ERROR: Use #include <linux/string.h> instead of <asm/string.h>
ERROR: Use #include <linux/errno.h> instead of <asm/errno.h>
Signed-off-by: Navya Sri Nizamkari <navyasri.tech@gmail.com>
---
Changes in v4:
-None.
Changes in v3:
-None.
Changes in v2:
-None.
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c
index 971fbe6..6d1c030 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c
@@ -14,8 +14,8 @@
#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"
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v4 4/4] staging: rtl8192u: Fix quoted string split across lines.
2015-02-26 7:08 [PATCH v4 0/4] staging: rtl8192u: Fix warnings in ieee80211_crypt.c Navya Sri Nizamkari
` (2 preceding siblings ...)
2015-02-26 7:21 ` [PATCH v4 3/4] staging: rtl8192u: Replace asm header files with linux ones Navya Sri Nizamkari
@ 2015-02-26 7:24 ` Navya Sri Nizamkari
3 siblings, 0 replies; 6+ messages in thread
From: Navya Sri Nizamkari @ 2015-02-26 7:24 UTC (permalink / raw)
To: outreachy-kernel
This patch fixes the checkpatch.pl warning:
WARNING: quoted string split across lines
Signed-off-by: Navya Sri Nizamkari <navyasri.tech@gmail.com>
---
Changes in v4:
-Indented arguments to be lined up in same column.
Changes in v3:
-None.
Changes in v2:
-None.
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c
index 6d1c030..949b23d 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c
@@ -65,8 +65,8 @@ 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)) {
- netdev_dbg(ieee->dev, "entries remaining in delayed crypt "
- "deletion list\n");
+ netdev_dbg(ieee->dev,
+ "entries remaining in delayed crypt deletion list\n");
ieee->crypt_deinit_timer.expires = jiffies + HZ;
add_timer(&ieee->crypt_deinit_timer);
}
@@ -118,7 +118,7 @@ int ieee80211_register_crypto_ops(struct ieee80211_crypto_ops *ops)
spin_unlock_irqrestore(&hcrypt->lock, flags);
pr_debug("ieee80211_crypt: registered algorithm '%s'\n",
- ops->name);
+ ops->name);
return 0;
}
@@ -145,8 +145,8 @@ int ieee80211_unregister_crypto_ops(struct ieee80211_crypto_ops *ops)
spin_unlock_irqrestore(&hcrypt->lock, flags);
if (del_alg) {
- pr_debug("ieee80211_crypt: unregistered algorithm "
- "'%s'\n", ops->name);
+ pr_debug("ieee80211_crypt: unregistered algorithm '%s'\n",
+ ops->name);
kfree(del_alg);
}
@@ -231,8 +231,8 @@ void __exit ieee80211_crypto_deinit(void)
struct ieee80211_crypto_alg *alg =
(struct ieee80211_crypto_alg *) ptr;
list_del(ptr);
- pr_debug("ieee80211_crypt: unregistered algorithm "
- "'%s' (deinit)\n", alg->ops->name);
+ pr_debug("ieee80211_crypt: unregistered algorithm '%s' (deinit)\n",
+ alg->ops->name);
kfree(alg);
}
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread