Commit 6db5c15c authored by Li Zhijian's avatar Li Zhijian Committed by Kalle Valo
Browse files

wifi: b43: Convert sprintf/snprintf to sysfs_emit 



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
Acked-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarLi Zhijian <lizhijian@fujitsu.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://msgid.link/20240315055211.1347548-2-lizhijian@fujitsu.com
parent c76936a7

drivers/net/wireless/broadcom/b43/sysfs.c

+4 −9
Original line number Diff line number Diff line
@@ -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,

		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);

drivers/net/wireless/broadcom/b43legacy/sysfs.c

+6 −10
Original line number Diff line number Diff line
@@ -75,16 +75,14 @@ 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 +153,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);