diff mbox series

[2/3] net: b43: Convert sprintf/snprintf to sysfs_emit

Message ID 20240314094823.1324898-2-lizhijian@fujitsu.com (mailing list archive)
State Changes Requested
Delegated to: Kalle Valo
Headers show
Series [1/3] net: ath: Convert sprintf/snprintf to sysfs_emit | expand

Commit Message

Li Zhijian March 14, 2024, 9:48 a.m. UTC 
Per filesystems/sysfs.rst, show() should only use sysfs_emit()
or sysfs_emit_at() when formatting the value to be returned to user space.

coccinelle complains that there are still a couple of functions that use
snprintf(). Convert them to sysfs_emit().

sprintf() will be converted as weel if they have.

Generally, this patch is generated by
make coccicheck M=<path/to/file> MODE=patch \
COCCI=scripts/coccinelle/api/device_attr_show.cocci

No functional change intended

CC: Larry Finger <Larry.Finger@lwfinger.net>
CC: Kalle Valo <kvalo@kernel.org>
CC: linux-wireless@vger.kernel.org
CC: b43-dev@lists.infradead.org
Signed-off-by: Li Zhijian <lizhijian@fujitsu.com>
---
This is a part of the work "Fix coccicheck device_attr_show warnings"[1]
Split them per subsystem so that the maintainer can review it easily
[1] https://lore.kernel.org/lkml/20240116041129.3937800-1-lizhijian@fujitsu.com/
---
 drivers/net/wireless/broadcom/b43/sysfs.c       | 13 ++++---------
 drivers/net/wireless/broadcom/b43legacy/sysfs.c | 17 +++++++----------
 2 files changed, 11 insertions(+), 19 deletions(-)

Comments

Larry Finger March 14, 2024, 6:08 p.m. UTC | #1 
On 3/14/24 04:48, Li Zhijian wrote:
> Per filesystems/sysfs.rst, show() should only use sysfs_emit()
> or sysfs_emit_at() when formatting the value to be returned to user space.
> 
> coccinelle complains that there are still a couple of functions that use
> snprintf(). Convert them to sysfs_emit().
> 
> sprintf() will be converted as weel if they have.
> 
> Generally, this patch is generated by
> make coccicheck M=<path/to/file> MODE=patch \
> COCCI=scripts/coccinelle/api/device_attr_show.cocci
> 
> No functional change intended
> 
> CC: Larry Finger <Larry.Finger@lwfinger.net>
> CC: Kalle Valo <kvalo@kernel.org>
> CC: linux-wireless@vger.kernel.org
> CC: b43-dev@lists.infradead.org
> Signed-off-by: Li Zhijian <lizhijian@fujitsu.com>
> ---
> This is a part of the work "Fix coccicheck device_attr_show warnings"[1]
> Split them per subsystem so that the maintainer can review it easily
> [1] https://lore.kernel.org/lkml/20240116041129.3937800-1-lizhijian@fujitsu.com/
> ---
>   drivers/net/wireless/broadcom/b43/sysfs.c       | 13 ++++---------
>   drivers/net/wireless/broadcom/b43legacy/sysfs.c | 17 +++++++----------
>   2 files changed, 11 insertions(+), 19 deletions(-)
> 
> diff --git a/drivers/net/wireless/broadcom/b43/sysfs.c b/drivers/net/wireless/broadcom/b43/sysfs.c
> index 0679d132968f..261b2b746a9c 100644
> --- a/drivers/net/wireless/broadcom/b43/sysfs.c
> +++ b/drivers/net/wireless/broadcom/b43/sysfs.c
> @@ -53,19 +53,14 @@ static ssize_t b43_attr_interfmode_show(struct device *dev,
>   
>   	switch (wldev->phy.g->interfmode) {
>   	case B43_INTERFMODE_NONE:
> -		count =
> -		    snprintf(buf, PAGE_SIZE,
> -			     "0 (No Interference Mitigation)\n");
> +		count = sysfs_emit(buf, "0 (No Interference Mitigation)\n");
>   		break;
>   	case B43_INTERFMODE_NONWLAN:
> -		count =
> -		    snprintf(buf, PAGE_SIZE,
> -			     "1 (Non-WLAN Interference Mitigation)\n");
> +		count = sysfs_emit(buf,
> +				   "1 (Non-WLAN Interference Mitigation)\n");
>   		break;
>   	case B43_INTERFMODE_MANUALWLAN:
> -		count =
> -		    snprintf(buf, PAGE_SIZE,
> -			     "2 (WLAN Interference Mitigation)\n");
> +		count = sysfs_emit(buf, "2 (WLAN Interference Mitigation)\n");
>   		break;
>   	default:
>   		B43_WARN_ON(1);
> diff --git a/drivers/net/wireless/broadcom/b43legacy/sysfs.c b/drivers/net/wireless/broadcom/b43legacy/sysfs.c
> index eec087ca30e6..b1c5ea4750fa 100644
> --- a/drivers/net/wireless/broadcom/b43legacy/sysfs.c
> +++ b/drivers/net/wireless/broadcom/b43legacy/sysfs.c
> @@ -75,16 +75,15 @@ static ssize_t b43legacy_attr_interfmode_show(struct device *dev,
>   
>   	switch (wldev->phy.interfmode) {
>   	case B43legacy_INTERFMODE_NONE:
> -		count = snprintf(buf, PAGE_SIZE, "0 (No Interference"
> -				 " Mitigation)\n");
> +		count = sysfs_emit(buf, "0 (No Interference" " Mitigation)\n");
>   		break;
>   	case B43legacy_INTERFMODE_NONWLAN:
> -		count = snprintf(buf, PAGE_SIZE, "1 (Non-WLAN Interference"
> -				 " Mitigation)\n");
> +		count = sysfs_emit(buf, "1 (Non-WLAN Interference"
> +				   " Mitigation)\n");
>   		break;
>   	case B43legacy_INTERFMODE_MANUALWLAN:
> -		count = snprintf(buf, PAGE_SIZE, "2 (WLAN Interference"
> -				 " Mitigation)\n");
> +		count = sysfs_emit(buf, "2 (WLAN Interference"
> +				   " Mitigation)\n");
>   		break;
>   	default:
>   		B43legacy_WARN_ON(1);
> @@ -155,11 +154,9 @@ static ssize_t b43legacy_attr_preamble_show(struct device *dev,
>   	mutex_lock(&wldev->wl->mutex);
>   
>   	if (wldev->short_preamble)
> -		count = snprintf(buf, PAGE_SIZE, "1 (Short Preamble"
> -				 " enabled)\n");
> +		count = sysfs_emit(buf, "1 (Short Preamble" " enabled)\n");
>   	else
> -		count = snprintf(buf, PAGE_SIZE, "0 (Short Preamble"
> -				 " disabled)\n");
> +		count = sysfs_emit(buf, "0 (Short Preamble" " disabled)\n");
>   
>   	mutex_unlock(&wldev->wl->mutex);
>   

The code changes are OK, but the subject should be "wifi: b43:", not "net: 
b43:". Kalle may be able to correct this when he applies the patch.

Acked-by: Larry Finger <Larry.Finger@lwfinger.net>

Thanks,

Larry
Michael Büsch March 14, 2024, 6:32 p.m. UTC | #2 
On Thu, 14 Mar 2024 17:48:22 +0800
Li Zhijian <lizhijian@fujitsu.com> wrote:

>  	case B43legacy_INTERFMODE_NONE:
> -		count = snprintf(buf, PAGE_SIZE, "0 (No Interference"
> -				 " Mitigation)\n");
> +		count = sysfs_emit(buf, "0 (No Interference" " Mitigation)\n");
>  		break;

>  	if (wldev->short_preamble)
> -		count = snprintf(buf, PAGE_SIZE, "1 (Short Preamble"
> -				 " enabled)\n");
> +		count = sysfs_emit(buf, "1 (Short Preamble" " enabled)\n");
>  	else
> -		count = snprintf(buf, PAGE_SIZE, "0 (Short Preamble"
> -				 " disabled)\n");
> +		count = sysfs_emit(buf, "0 (Short Preamble" " disabled)\n");
>  

Please either leave the line break in place, or remove the string continuation.
Li Zhijian March 15, 2024, 1:16 a.m. UTC | #3 
On 15/03/2024 02:32, Michael Büsch wrote:
> On Thu, 14 Mar 2024 17:48:22 +0800
> Li Zhijian <lizhijian@fujitsu.com> wrote:
> 
>>   	case B43legacy_INTERFMODE_NONE:
>> -		count = snprintf(buf, PAGE_SIZE, "0 (No Interference"
>> -				 " Mitigation)\n");
>> +		count = sysfs_emit(buf, "0 (No Interference" " Mitigation)\n");
>>   		break;
> 
>>   	if (wldev->short_preamble)
>> -		count = snprintf(buf, PAGE_SIZE, "1 (Short Preamble"
>> -				 " enabled)\n");
>> +		count = sysfs_emit(buf, "1 (Short Preamble" " enabled)\n");
>>   	else
>> -		count = snprintf(buf, PAGE_SIZE, "0 (Short Preamble"
>> -				 " disabled)\n");
>> +		count = sysfs_emit(buf, "0 (Short Preamble" " disabled)\n");
>>   
> 
> Please either leave the line break in place, or remove the string continuation.

Good catch, i will update it.


Thanks
Zhijian

> 
> 
>
diff mbox series

Patch

diff --git a/drivers/net/wireless/broadcom/b43/sysfs.c b/drivers/net/wireless/broadcom/b43/sysfs.c
index 0679d132968f..261b2b746a9c 100644
--- a/drivers/net/wireless/broadcom/b43/sysfs.c
+++ b/drivers/net/wireless/broadcom/b43/sysfs.c
@@ -53,19 +53,14 @@  static ssize_t b43_attr_interfmode_show(struct device *dev,
 
 	switch (wldev->phy.g->interfmode) {
 	case B43_INTERFMODE_NONE:
-		count =
-		    snprintf(buf, PAGE_SIZE,
-			     "0 (No Interference Mitigation)\n");
+		count = sysfs_emit(buf, "0 (No Interference Mitigation)\n");
 		break;
 	case B43_INTERFMODE_NONWLAN:
-		count =
-		    snprintf(buf, PAGE_SIZE,
-			     "1 (Non-WLAN Interference Mitigation)\n");
+		count = sysfs_emit(buf,
+				   "1 (Non-WLAN Interference Mitigation)\n");
 		break;
 	case B43_INTERFMODE_MANUALWLAN:
-		count =
-		    snprintf(buf, PAGE_SIZE,
-			     "2 (WLAN Interference Mitigation)\n");
+		count = sysfs_emit(buf, "2 (WLAN Interference Mitigation)\n");
 		break;
 	default:
 		B43_WARN_ON(1);
diff --git a/drivers/net/wireless/broadcom/b43legacy/sysfs.c b/drivers/net/wireless/broadcom/b43legacy/sysfs.c
index eec087ca30e6..b1c5ea4750fa 100644
--- a/drivers/net/wireless/broadcom/b43legacy/sysfs.c
+++ b/drivers/net/wireless/broadcom/b43legacy/sysfs.c
@@ -75,16 +75,15 @@  static ssize_t b43legacy_attr_interfmode_show(struct device *dev,
 
 	switch (wldev->phy.interfmode) {
 	case B43legacy_INTERFMODE_NONE:
-		count = snprintf(buf, PAGE_SIZE, "0 (No Interference"
-				 " Mitigation)\n");
+		count = sysfs_emit(buf, "0 (No Interference" " Mitigation)\n");
 		break;
 	case B43legacy_INTERFMODE_NONWLAN:
-		count = snprintf(buf, PAGE_SIZE, "1 (Non-WLAN Interference"
-				 " Mitigation)\n");
+		count = sysfs_emit(buf, "1 (Non-WLAN Interference"
+				   " Mitigation)\n");
 		break;
 	case B43legacy_INTERFMODE_MANUALWLAN:
-		count = snprintf(buf, PAGE_SIZE, "2 (WLAN Interference"
-				 " Mitigation)\n");
+		count = sysfs_emit(buf, "2 (WLAN Interference"
+				   " Mitigation)\n");
 		break;
 	default:
 		B43legacy_WARN_ON(1);
@@ -155,11 +154,9 @@  static ssize_t b43legacy_attr_preamble_show(struct device *dev,
 	mutex_lock(&wldev->wl->mutex);
 
 	if (wldev->short_preamble)
-		count = snprintf(buf, PAGE_SIZE, "1 (Short Preamble"
-				 " enabled)\n");
+		count = sysfs_emit(buf, "1 (Short Preamble" " enabled)\n");
 	else
-		count = snprintf(buf, PAGE_SIZE, "0 (Short Preamble"
-				 " disabled)\n");
+		count = sysfs_emit(buf, "0 (Short Preamble" " disabled)\n");
 
 	mutex_unlock(&wldev->wl->mutex);