[PATCH] staging/rtl8192u/ieee80211: use __func__ macro

[PATCH] staging/rtl8192u/ieee80211: use __func__ macro

[Elena Afanasova]

Replace function names with __func__ macro.
Remove unnecessary characters in error messages.
Reported by checkpatch.pl.

Signed-off-by: Elena Afanasova <eafanasova@gmail.com>
---
 drivers/staging/rtl8192u/ieee80211/dot11d.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/rtl8192u/ieee80211/dot11d.c b/drivers/staging/rtl8192u/ieee80211/dot11d.c
index bc642076b96f..f972edcde8a0 100644
--- a/drivers/staging/rtl8192u/ieee80211/dot11d.c
+++ b/drivers/staging/rtl8192u/ieee80211/dot11d.c
@@ -15,7 +15,7 @@ void rtl8192u_dot11d_init(struct ieee80211_device *ieee)
 	memset(dot11d_info->max_tx_pwr_dbm_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
 	RESET_CIE_WATCHDOG(ieee);
 
-	netdev_info(ieee->dev, "rtl8192u_dot11d_init()\n");
+	netdev_info(ieee->dev, "%s\n", __func__);
 }
 EXPORT_SYMBOL(rtl8192u_dot11d_init);
 
@@ -66,14 +66,14 @@ void dot11d_update_country_ie(struct ieee80211_device *dev, u8 *pTaddr,
 			/* It is not in a monotonically increasing order, so
 			 * stop processing.
 			 */
-			netdev_err(dev->dev, "dot11d_update_country_ie(): Invalid country IE, skip it........1\n");
+			netdev_err(dev->dev, "%s: Invalid country IE, skip it 1\n", __func__);
 			return;
 		}
 		if (MAX_CHANNEL_NUMBER < (pTriple->first_channel + pTriple->num_channels)) {
 			/* It is not a valid set of channel id, so stop
 			 * processing.
 			 */
-			netdev_err(dev->dev, "dot11d_update_country_ie(): Invalid country IE, skip it........2\n");
+			netdev_err(dev->dev, "%s: Invalid country IE, skip it 2\n", __func__);
 			return;
 		}
 
@@ -105,7 +105,7 @@ u8 dot11d_get_max_tx_pwr_in_dbm(struct ieee80211_device *dev, u8 Channel)
 	u8 MaxTxPwrInDbm = 255;
 
 	if (Channel > MAX_CHANNEL_NUMBER) {
-		netdev_err(dev->dev, "dot11d_get_max_tx_pwr_in_dbm(): Invalid Channel\n");
+		netdev_err(dev->dev, "%s: Invalid Channel\n", __func__);
 		return MaxTxPwrInDbm;
 	}
 	if (dot11d_info->channel_map[Channel])
@@ -141,7 +141,7 @@ int is_legal_channel(struct ieee80211_device *dev, u8 channel)
 	struct rt_dot11d_info *dot11d_info = GET_DOT11D_INFO(dev);
 
 	if (channel > MAX_CHANNEL_NUMBER) {
-		netdev_err(dev->dev, "is_legal_channel(): Invalid Channel\n");
+		netdev_err(dev->dev, "%s: Invalid Channel\n", __func__);
 		return 0;
 	}
 	if (dot11d_info->channel_map[channel] > 0)
@@ -164,7 +164,7 @@ int to_legal_channel(struct ieee80211_device *dev, u8 channel)
 	}
 
 	if (channel > MAX_CHANNEL_NUMBER) {
-		netdev_err(dev->dev, "is_legal_channel(): Invalid Channel\n");
+		netdev_err(dev->dev, "%s: Invalid Channel\n", __func__);
 		return default_chn;
 	}
 
-- 
2.25.1

Re: [PATCH] staging/rtl8192u/ieee80211: use __func__ macro

[Greg KH]

On Tue, Oct 20, 2020 at 08:08:23AM -0700, Elena Afanasova wrote:
> Replace function names with __func__ macro.
> Remove unnecessary characters in error messages.
> Reported by checkpatch.pl.
> 
> Signed-off-by: Elena Afanasova <eafanasova@gmail.com>
> ---
>  drivers/staging/rtl8192u/ieee80211/dot11d.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/staging/rtl8192u/ieee80211/dot11d.c b/drivers/staging/rtl8192u/ieee80211/dot11d.c
> index bc642076b96f..f972edcde8a0 100644
> --- a/drivers/staging/rtl8192u/ieee80211/dot11d.c
> +++ b/drivers/staging/rtl8192u/ieee80211/dot11d.c
> @@ -15,7 +15,7 @@ void rtl8192u_dot11d_init(struct ieee80211_device *ieee)
>  	memset(dot11d_info->max_tx_pwr_dbm_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
>  	RESET_CIE_WATCHDOG(ieee);
>  
> -	netdev_info(ieee->dev, "rtl8192u_dot11d_init()\n");
> +	netdev_info(ieee->dev, "%s\n", __func__);

This is a pure debugging line, and should just be removed.  Can you do
that as an add-on patch to this?

thanks,

greg k-h

Re: [PATCH] staging/rtl8192u/ieee80211: use __func__ macro

[Elena Afanasova]

On Tue, 2020-10-20 at 17:19 +0200, Greg KH wrote:
> On Tue, Oct 20, 2020 at 08:08:23AM -0700, Elena Afanasova wrote:
> > Replace function names with __func__ macro.
> > Remove unnecessary characters in error messages.
> > Reported by checkpatch.pl.
> > 
> > Signed-off-by: Elena Afanasova <eafanasova@gmail.com>
> > ---
> >  drivers/staging/rtl8192u/ieee80211/dot11d.c | 12 ++++++------
> >  1 file changed, 6 insertions(+), 6 deletions(-)
> > 
> > diff --git a/drivers/staging/rtl8192u/ieee80211/dot11d.c
> > b/drivers/staging/rtl8192u/ieee80211/dot11d.c
> > index bc642076b96f..f972edcde8a0 100644
> > --- a/drivers/staging/rtl8192u/ieee80211/dot11d.c
> > +++ b/drivers/staging/rtl8192u/ieee80211/dot11d.c
> > @@ -15,7 +15,7 @@ void rtl8192u_dot11d_init(struct ieee80211_device
> > *ieee)
> >  	memset(dot11d_info->max_tx_pwr_dbm_list, 0xFF,
> > MAX_CHANNEL_NUMBER + 1);
> >  	RESET_CIE_WATCHDOG(ieee);
> >  
> > -	netdev_info(ieee->dev, "rtl8192u_dot11d_init()\n");
> > +	netdev_info(ieee->dev, "%s\n", __func__);
> 
> This is a pure debugging line, and should just be removed.  Can you
> do
> that as an add-on patch to this?

ok
> 
> thanks,
> 
> greg k-h