[PATCH v2] staging: rtl8192u: remove split in user-visible string

Leonid Pershin posted 1 patch 2 years, 6 months ago
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
[PATCH v2] staging: rtl8192u: remove split in user-visible string
Posted by Leonid Pershin 2 years, 6 months ago
According to coding style, user-visible strings in printk()
function calls cannot be split across multiple lines.
Issue found with checkpatch.pl.

Signed-off-by: Leonid Pershin <leonid.pershin@gmail.com>
---
Changes in v2:
  - Replace printk(KERN_DEBUG...) with pr_debug()

 drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c
index 9bfd24ad46b6..c378bdff453b 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c
@@ -72,16 +72,14 @@ static void *ieee80211_tkip_init(int key_idx)
 
 	priv->tx_tfm_michael = crypto_alloc_shash("michael_mic", 0, 0);
 	if (IS_ERR(priv->tx_tfm_michael)) {
-		printk(KERN_DEBUG "ieee80211_crypt_tkip: could not allocate "
-				"crypto API michael_mic\n");
+		pr_debug("ieee80211_crypt_tkip: could not allocate crypto API michael_mic\n");
 		priv->tx_tfm_michael = NULL;
 		goto fail;
 	}
 
 	priv->rx_tfm_michael = crypto_alloc_shash("michael_mic", 0, 0);
 	if (IS_ERR(priv->rx_tfm_michael)) {
-		printk(KERN_DEBUG "ieee80211_crypt_tkip: could not allocate "
-				"crypto API michael_mic\n");
+		pr_debug("ieee80211_crypt_tkip: could not allocate crypto API michael_mic\n");
 		priv->rx_tfm_michael = NULL;
 		goto fail;
 	}
-- 
2.39.2
Re: [PATCH v2] staging: rtl8192u: remove split in user-visible string
Posted by Greg Kroah-Hartman 2 years, 6 months ago
On Thu, Feb 23, 2023 at 10:35:57PM +0300, Leonid Pershin wrote:
> According to coding style, user-visible strings in printk()
> function calls cannot be split across multiple lines.
> Issue found with checkpatch.pl.
> 
> Signed-off-by: Leonid Pershin <leonid.pershin@gmail.com>
> ---
> Changes in v2:
>   - Replace printk(KERN_DEBUG...) with pr_debug()

Now you are doing two different things, please only do one thing per
patch.

> 
>  drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c
> index 9bfd24ad46b6..c378bdff453b 100644
> --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c
> +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c
> @@ -72,16 +72,14 @@ static void *ieee80211_tkip_init(int key_idx)
>  
>  	priv->tx_tfm_michael = crypto_alloc_shash("michael_mic", 0, 0);
>  	if (IS_ERR(priv->tx_tfm_michael)) {
> -		printk(KERN_DEBUG "ieee80211_crypt_tkip: could not allocate "
> -				"crypto API michael_mic\n");
> +		pr_debug("ieee80211_crypt_tkip: could not allocate crypto API michael_mic\n");

Are you sure you need the prefix now that you are using pr_debug()?  And
as this is a driver, why not use the networking debug macros instead?

>  		priv->tx_tfm_michael = NULL;
>  		goto fail;
>  	}
>  
>  	priv->rx_tfm_michael = crypto_alloc_shash("michael_mic", 0, 0);
>  	if (IS_ERR(priv->rx_tfm_michael)) {
> -		printk(KERN_DEBUG "ieee80211_crypt_tkip: could not allocate "
> -				"crypto API michael_mic\n");
> +		pr_debug("ieee80211_crypt_tkip: could not allocate crypto API michael_mic\n");

Same here, do you still need the prefix and why not dev_dbg() or the
network version?

thanks,

greg k-h
Re: [PATCH v2] staging: rtl8192u: remove split in user-visible string
Posted by Deepak R Varma 2 years, 6 months ago
On Thu, Feb 23, 2023 at 10:35:57PM +0300, Leonid Pershin wrote:
> According to coding style, user-visible strings in printk()
> function calls cannot be split across multiple lines.
> Issue found with checkpatch.pl.
> 
> Signed-off-by: Leonid Pershin <leonid.pershin@gmail.com>
> ---
> Changes in v2:
>   - Replace printk(KERN_DEBUG...) with pr_debug()

Hello Leonid,
I was not able to trace the v1 of this patch. Did that have a different subject?

Thank you,
Deepak.

> 
>  drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)