* [PATCH 1/3] net: ath: Convert sprintf/snprintf to sysfs_emit
@ 2024-03-14 9:48 Li Zhijian
2024-03-14 9:48 ` [PATCH 2/3] net: b43: " Li Zhijian
2024-03-14 9:48 ` [PATCH 3/3] net: ti: " Li Zhijian
0 siblings, 2 replies; 6+ messages in thread
From: Li Zhijian @ 2024-03-14 9:48 UTC (permalink / raw)
To: linux-kernel
Cc: Li Zhijian, Kalle Valo, Jeff Johnson, linux-wireless, ath11k,
ath10k
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: Kalle Valo <kvalo@kernel.org>
CC: Jeff Johnson <jjohnson@kernel.org>
CC: linux-wireless@vger.kernel.org
CC: ath11k@lists.infradead.org
CC: ath10k@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/ath/ath10k/thermal.c | 2 +-
drivers/net/wireless/ath/ath11k/thermal.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/thermal.c b/drivers/net/wireless/ath/ath10k/thermal.c
index 31c8d7fbb095..8b15ec07b107 100644
--- a/drivers/net/wireless/ath/ath10k/thermal.c
+++ b/drivers/net/wireless/ath/ath10k/thermal.c
@@ -100,7 +100,7 @@ static ssize_t ath10k_thermal_show_temp(struct device *dev,
spin_unlock_bh(&ar->data_lock);
/* display in millidegree celsius */
- ret = snprintf(buf, PAGE_SIZE, "%d\n", temperature * 1000);
+ ret = sysfs_emit(buf, "%d\n", temperature * 1000);
out:
mutex_unlock(&ar->conf_mutex);
return ret;
diff --git a/drivers/net/wireless/ath/ath11k/thermal.c b/drivers/net/wireless/ath/ath11k/thermal.c
index 41e7499f075f..18d6eab5cce3 100644
--- a/drivers/net/wireless/ath/ath11k/thermal.c
+++ b/drivers/net/wireless/ath/ath11k/thermal.c
@@ -101,7 +101,7 @@ static ssize_t ath11k_thermal_show_temp(struct device *dev,
spin_unlock_bh(&ar->data_lock);
/* display in millidegree Celsius */
- ret = snprintf(buf, PAGE_SIZE, "%d\n", temperature * 1000);
+ ret = sysfs_emit(buf, "%d\n", temperature * 1000);
out:
mutex_unlock(&ar->conf_mutex);
return ret;
--
2.29.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] net: b43: Convert sprintf/snprintf to sysfs_emit
2024-03-14 9:48 [PATCH 1/3] net: ath: Convert sprintf/snprintf to sysfs_emit Li Zhijian
@ 2024-03-14 9:48 ` Li Zhijian
2024-03-14 18:08 ` Larry Finger
2024-03-14 18:32 ` Michael Büsch
2024-03-14 9:48 ` [PATCH 3/3] net: ti: " Li Zhijian
1 sibling, 2 replies; 6+ messages in thread
From: Li Zhijian @ 2024-03-14 9:48 UTC (permalink / raw)
To: linux-kernel
Cc: Li Zhijian, Larry Finger, Kalle Valo, linux-wireless, b43-dev
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);
--
2.29.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] net: ti: Convert sprintf/snprintf to sysfs_emit
2024-03-14 9:48 [PATCH 1/3] net: ath: Convert sprintf/snprintf to sysfs_emit Li Zhijian
2024-03-14 9:48 ` [PATCH 2/3] net: b43: " Li Zhijian
@ 2024-03-14 9:48 ` Li Zhijian
1 sibling, 0 replies; 6+ messages in thread
From: Li Zhijian @ 2024-03-14 9:48 UTC (permalink / raw)
To: linux-kernel; +Cc: Li Zhijian, Kalle Valo, linux-wireless
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: Kalle Valo <kvalo@kernel.org>
CC: linux-wireless@vger.kernel.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/ti/wlcore/sysfs.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/net/wireless/ti/wlcore/sysfs.c b/drivers/net/wireless/ti/wlcore/sysfs.c
index f0c7e09b314d..376afa3388a4 100644
--- a/drivers/net/wireless/ti/wlcore/sysfs.c
+++ b/drivers/net/wireless/ti/wlcore/sysfs.c
@@ -19,11 +19,9 @@ static ssize_t bt_coex_state_show(struct device *dev,
struct wl1271 *wl = dev_get_drvdata(dev);
ssize_t len;
- len = PAGE_SIZE;
-
mutex_lock(&wl->mutex);
- len = snprintf(buf, len, "%d\n\n0 - off\n1 - on\n",
- wl->sg_enabled);
+ len = sysfs_emit(buf, "%d\n\n0 - off\n1 - on\n",
+ wl->sg_enabled);
mutex_unlock(&wl->mutex);
return len;
@@ -78,13 +76,11 @@ static ssize_t hw_pg_ver_show(struct device *dev,
struct wl1271 *wl = dev_get_drvdata(dev);
ssize_t len;
- len = PAGE_SIZE;
-
mutex_lock(&wl->mutex);
if (wl->hw_pg_ver >= 0)
- len = snprintf(buf, len, "%d\n", wl->hw_pg_ver);
+ len = sysfs_emit(buf, "%d\n", wl->hw_pg_ver);
else
- len = snprintf(buf, len, "n/a\n");
+ len = sysfs_emit(buf, "n/a\n");
mutex_unlock(&wl->mutex);
return len;
--
2.29.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] net: b43: Convert sprintf/snprintf to sysfs_emit
2024-03-14 9:48 ` [PATCH 2/3] net: b43: " Li Zhijian
@ 2024-03-14 18:08 ` Larry Finger
2024-03-14 18:32 ` Michael Büsch
1 sibling, 0 replies; 6+ messages in thread
From: Larry Finger @ 2024-03-14 18:08 UTC (permalink / raw)
To: Li Zhijian, linux-kernel; +Cc: Kalle Valo, linux-wireless, b43-dev
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] net: b43: Convert sprintf/snprintf to sysfs_emit
2024-03-14 9:48 ` [PATCH 2/3] net: b43: " Li Zhijian
2024-03-14 18:08 ` Larry Finger
@ 2024-03-14 18:32 ` Michael Büsch
2024-03-15 1:16 ` Zhijian Li (Fujitsu)
1 sibling, 1 reply; 6+ messages in thread
From: Michael Büsch @ 2024-03-14 18:32 UTC (permalink / raw)
To: Li Zhijian
Cc: linux-kernel, Larry Finger, Kalle Valo, linux-wireless, b43-dev
[-- Attachment #1: Type: text/plain, Size: 768 bytes --]
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.
--
Michael Büsch
https://bues.ch/
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] net: b43: Convert sprintf/snprintf to sysfs_emit
2024-03-14 18:32 ` Michael Büsch
@ 2024-03-15 1:16 ` Zhijian Li (Fujitsu)
0 siblings, 0 replies; 6+ messages in thread
From: Zhijian Li (Fujitsu) @ 2024-03-15 1:16 UTC (permalink / raw)
To: Michael Büsch
Cc: linux-kernel@vger.kernel.org, Larry Finger, Kalle Valo,
linux-wireless@vger.kernel.org, b43-dev@lists.infradead.org
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
>
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-03-15 1:17 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-14 9:48 [PATCH 1/3] net: ath: Convert sprintf/snprintf to sysfs_emit Li Zhijian
2024-03-14 9:48 ` [PATCH 2/3] net: b43: " Li Zhijian
2024-03-14 18:08 ` Larry Finger
2024-03-14 18:32 ` Michael Büsch
2024-03-15 1:16 ` Zhijian Li (Fujitsu)
2024-03-14 9:48 ` [PATCH 3/3] net: ti: " Li Zhijian
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox