Skip to contentSkip to conversation

staging/rtl8192u/ieee80211: use __func__ macro

PATCH In review Elena Afanasova 2 participants 3 messages Oct 20, 2020 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging/rtl8192u/ieee80211: use __func__ macro

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

---
 drivers/staging/rtl8192u/ieee80211/dot11d.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/rtl8192u/ieee80211/dot11d.c +6 -6
index bc642076b96f..f972edcde8a0 100644
@@ -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;
 	}
 
Signature · 1 line
2.25.1
maintainer
#1 lore raw
Quoted 14 lines · Elena Afanasova

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

---
 drivers/staging/rtl8192u/ieee80211/dot11d.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/rtl8192u/ieee80211/dot11d.c +0 -0
index bc642076b96f..f972edcde8a0 100644

drivers/staging/rtl8192u/ieee80211/dot11d.c void rtl8192u_dot11d_init(struct ieee80211_device *ieee) · line 18

Quoted 5 lines
drivers/staging/rtl8192u/ieee80211/dot11d.c +1 -1
@@ -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

#2 lore raw
Quoted 21 lines · Greg KH
Quoted 20 lines · Elena Afanasova

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

---
 drivers/staging/rtl8192u/ieee80211/dot11d.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/rtl8192u/ieee80211/dot11d.c +0 -0
index bc642076b96f..f972edcde8a0 100644
@@ -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);
 
Quoted 6 lines

drivers/staging/rtl8192u/ieee80211/dot11d.c void rtl8192u_dot11d_init(struct ieee80211_device *ieee) · line 18

Quoted 2 lines
drivers/staging/rtl8192u/ieee80211/dot11d.c +1 -1
-	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

Quoted 4 lines

thanks,

greg k-h