diff mbox series

[net-next] sfc: Convert to use sysfs_emit_at() API

Message ID	202212081523277319144@zte.com.cn
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Date: Thu, 8 Dec 2022 15:23:27 +0800 (CST) Message-ID: <202212081523277319144@zte.com.cn> Mime-Version: 1.0 From: <ye.xingchen@zte.com.cn> To: <kuba@kernel.org> Cc: <ecree.xilinx@gmail.com>, <habetsm.xilinx@gmail.com>, <davem@davemloft.net>, <edumazet@google.com>, <pabeni@redhat.com>, <wangxiang@cdjrlc.com>, <dossche.niels@gmail.com>, <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org> Subject: =?utf-8?q?=5BPATCH_net-next=5D_sfc=3A_Convert_to_use_sysfs=5Femit?= =?utf-8?q?=5Fat=28=29_API?= Content-Type: text/plain; charset="UTF-8" Precedence: bulk
Series	[net-next] sfc: Convert to use sysfs_emit_at() API \| [net-next] sfc: Convert to use sysfs_emit_at() API

Commit Message

ye.xingchen@zte.com.cn Dec. 8, 2022, 7:23 a.m. UTC

  From: ye xingchen <ye.xingchen@zte.com.cn>

Follow the advice of the Documentation/filesystems/sysfs.rst and show()
should only use sysfs_emit() or sysfs_emit_at() when formatting the
value to be returned to user space.

Signed-off-by: ye xingchen <ye.xingchen@zte.com.cn>
---
 drivers/net/ethernet/sfc/mcdi.c       | 14 ++++----------
 drivers/net/ethernet/sfc/siena/mcdi.c | 14 ++++----------
 2 files changed, 8 insertions(+), 20 deletions(-)

Comments

Martin Habets Dec. 8, 2022, 8:24 a.m. UTC | #1

On Thu, Dec 08, 2022 at 03:23:27PM +0800, ye.xingchen@zte.com.cn wrote:
> From: ye xingchen <ye.xingchen@zte.com.cn>
> 
> Follow the advice of the Documentation/filesystems/sysfs.rst and show()
> should only use sysfs_emit() or sysfs_emit_at() when formatting the
> value to be returned to user space.

That advice is for sysfs but this output is going into dmesg. So it
does not apply here.

Martin

> Signed-off-by: ye xingchen <ye.xingchen@zte.com.cn>
> ---
>  drivers/net/ethernet/sfc/mcdi.c       | 14 ++++----------
>  drivers/net/ethernet/sfc/siena/mcdi.c | 14 ++++----------
>  2 files changed, 8 insertions(+), 20 deletions(-)
> 
> diff --git a/drivers/net/ethernet/sfc/mcdi.c b/drivers/net/ethernet/sfc/mcdi.c
> index af338208eae9..73269db3ca39 100644
> --- a/drivers/net/ethernet/sfc/mcdi.c
> +++ b/drivers/net/ethernet/sfc/mcdi.c
> @@ -210,14 +210,10 @@ static void efx_mcdi_send_request(struct efx_nic *efx, unsigned cmd,
>  		 * progress on a NIC at any one time.  So no need for locking.
>  		 */
>  		for (i = 0; i < hdr_len / 4 && bytes < PAGE_SIZE; i++)
> -			bytes += scnprintf(buf + bytes, PAGE_SIZE - bytes,
> -					   " %08x",
> -					   le32_to_cpu(hdr[i].u32[0]));
> +			bytes += sysfs_emit_at(buf, bytes, " %08x", le32_to_cpu(hdr[i].u32[0]));
> 
>  		for (i = 0; i < inlen / 4 && bytes < PAGE_SIZE; i++)
> -			bytes += scnprintf(buf + bytes, PAGE_SIZE - bytes,
> -					   " %08x",
> -					   le32_to_cpu(inbuf[i].u32[0]));
> +			bytes += sysfs_emit_at(buf, bytes, " %08x", le32_to_cpu(inbuf[i].u32[0]));
> 
>  		netif_info(efx, hw, efx->net_dev, "MCDI RPC REQ:%s\n", buf);
>  	}
> @@ -302,15 +298,13 @@ static void efx_mcdi_read_response_header(struct efx_nic *efx)
>  		 */
>  		for (i = 0; i < hdr_len && bytes < PAGE_SIZE; i++) {
>  			efx->type->mcdi_read_response(efx, &hdr, (i * 4), 4);
> -			bytes += scnprintf(buf + bytes, PAGE_SIZE - bytes,
> -					   " %08x", le32_to_cpu(hdr.u32[0]));
> +			bytes += sysfs_emit_at(buf, bytes, " %08x", le32_to_cpu(hdr.u32[0]));
>  		}
> 
>  		for (i = 0; i < data_len && bytes < PAGE_SIZE; i++) {
>  			efx->type->mcdi_read_response(efx, &hdr,
>  					mcdi->resp_hdr_len + (i * 4), 4);
> -			bytes += scnprintf(buf + bytes, PAGE_SIZE - bytes,
> -					   " %08x", le32_to_cpu(hdr.u32[0]));
> +			bytes += sysfs_emit_at(buf, bytes, " %08x", le32_to_cpu(hdr.u32[0]));
>  		}
> 
>  		netif_info(efx, hw, efx->net_dev, "MCDI RPC RESP:%s\n", buf);
> diff --git a/drivers/net/ethernet/sfc/siena/mcdi.c b/drivers/net/ethernet/sfc/siena/mcdi.c
> index 3f7899daa86a..4e10d4594c3a 100644
> --- a/drivers/net/ethernet/sfc/siena/mcdi.c
> +++ b/drivers/net/ethernet/sfc/siena/mcdi.c
> @@ -213,14 +213,10 @@ static void efx_mcdi_send_request(struct efx_nic *efx, unsigned cmd,
>  		 * progress on a NIC at any one time.  So no need for locking.
>  		 */
>  		for (i = 0; i < hdr_len / 4 && bytes < PAGE_SIZE; i++)
> -			bytes += scnprintf(buf + bytes, PAGE_SIZE - bytes,
> -					   " %08x",
> -					   le32_to_cpu(hdr[i].u32[0]));
> +			bytes += sysfs_emit_at(buf, bytes, " %08x", le32_to_cpu(hdr[i].u32[0]));
> 
>  		for (i = 0; i < inlen / 4 && bytes < PAGE_SIZE; i++)
> -			bytes += scnprintf(buf + bytes, PAGE_SIZE - bytes,
> -					   " %08x",
> -					   le32_to_cpu(inbuf[i].u32[0]));
> +			bytes += sysfs_emit_at(buf, bytes, " %08x", le32_to_cpu(inbuf[i].u32[0]));
> 
>  		netif_info(efx, hw, efx->net_dev, "MCDI RPC REQ:%s\n", buf);
>  	}
> @@ -305,15 +301,13 @@ static void efx_mcdi_read_response_header(struct efx_nic *efx)
>  		 */
>  		for (i = 0; i < hdr_len && bytes < PAGE_SIZE; i++) {
>  			efx->type->mcdi_read_response(efx, &hdr, (i * 4), 4);
> -			bytes += scnprintf(buf + bytes, PAGE_SIZE - bytes,
> -					   " %08x", le32_to_cpu(hdr.u32[0]));
> +			bytes += sysfs_emit_at(buf, bytes, " %08x", le32_to_cpu(hdr.u32[0]));
>  		}
> 
>  		for (i = 0; i < data_len && bytes < PAGE_SIZE; i++) {
>  			efx->type->mcdi_read_response(efx, &hdr,
>  					mcdi->resp_hdr_len + (i * 4), 4);
> -			bytes += scnprintf(buf + bytes, PAGE_SIZE - bytes,
> -					   " %08x", le32_to_cpu(hdr.u32[0]));
> +			bytes += sysfs_emit_at(buf, bytes, " %08x", le32_to_cpu(hdr.u32[0]));
>  		}
> 
>  		netif_info(efx, hw, efx->net_dev, "MCDI RPC RESP:%s\n", buf);
> -- 
> 2.25.1

diff mbox series

Patch

diff --git a/drivers/net/ethernet/sfc/mcdi.c b/drivers/net/ethernet/sfc/mcdi.c
index af338208eae9..73269db3ca39 100644
--- a/drivers/net/ethernet/sfc/mcdi.c
+++ b/drivers/net/ethernet/sfc/mcdi.c
@@ -210,14 +210,10 @@  static void efx_mcdi_send_request(struct efx_nic *efx, unsigned cmd,
 		 * progress on a NIC at any one time.  So no need for locking.
 		 */
 		for (i = 0; i < hdr_len / 4 && bytes < PAGE_SIZE; i++)
-			bytes += scnprintf(buf + bytes, PAGE_SIZE - bytes,
-					   " %08x",
-					   le32_to_cpu(hdr[i].u32[0]));
+			bytes += sysfs_emit_at(buf, bytes, " %08x", le32_to_cpu(hdr[i].u32[0]));

 		for (i = 0; i < inlen / 4 && bytes < PAGE_SIZE; i++)
-			bytes += scnprintf(buf + bytes, PAGE_SIZE - bytes,
-					   " %08x",
-					   le32_to_cpu(inbuf[i].u32[0]));
+			bytes += sysfs_emit_at(buf, bytes, " %08x", le32_to_cpu(inbuf[i].u32[0]));

 		netif_info(efx, hw, efx->net_dev, "MCDI RPC REQ:%s\n", buf);
 	}
@@ -302,15 +298,13 @@  static void efx_mcdi_read_response_header(struct efx_nic *efx)
 		 */
 		for (i = 0; i < hdr_len && bytes < PAGE_SIZE; i++) {
 			efx->type->mcdi_read_response(efx, &hdr, (i * 4), 4);
-			bytes += scnprintf(buf + bytes, PAGE_SIZE - bytes,
-					   " %08x", le32_to_cpu(hdr.u32[0]));
+			bytes += sysfs_emit_at(buf, bytes, " %08x", le32_to_cpu(hdr.u32[0]));
 		}

 		for (i = 0; i < data_len && bytes < PAGE_SIZE; i++) {
 			efx->type->mcdi_read_response(efx, &hdr,
 					mcdi->resp_hdr_len + (i * 4), 4);
-			bytes += scnprintf(buf + bytes, PAGE_SIZE - bytes,
-					   " %08x", le32_to_cpu(hdr.u32[0]));
+			bytes += sysfs_emit_at(buf, bytes, " %08x", le32_to_cpu(hdr.u32[0]));
 		}

 		netif_info(efx, hw, efx->net_dev, "MCDI RPC RESP:%s\n", buf);
diff --git a/drivers/net/ethernet/sfc/siena/mcdi.c b/drivers/net/ethernet/sfc/siena/mcdi.c
index 3f7899daa86a..4e10d4594c3a 100644
--- a/drivers/net/ethernet/sfc/siena/mcdi.c
+++ b/drivers/net/ethernet/sfc/siena/mcdi.c
@@ -213,14 +213,10 @@  static void efx_mcdi_send_request(struct efx_nic *efx, unsigned cmd,
 		 * progress on a NIC at any one time.  So no need for locking.
 		 */
 		for (i = 0; i < hdr_len / 4 && bytes < PAGE_SIZE; i++)
-			bytes += scnprintf(buf + bytes, PAGE_SIZE - bytes,
-					   " %08x",
-					   le32_to_cpu(hdr[i].u32[0]));
+			bytes += sysfs_emit_at(buf, bytes, " %08x", le32_to_cpu(hdr[i].u32[0]));

 		for (i = 0; i < inlen / 4 && bytes < PAGE_SIZE; i++)
-			bytes += scnprintf(buf + bytes, PAGE_SIZE - bytes,
-					   " %08x",
-					   le32_to_cpu(inbuf[i].u32[0]));
+			bytes += sysfs_emit_at(buf, bytes, " %08x", le32_to_cpu(inbuf[i].u32[0]));

 		netif_info(efx, hw, efx->net_dev, "MCDI RPC REQ:%s\n", buf);
 	}
@@ -305,15 +301,13 @@  static void efx_mcdi_read_response_header(struct efx_nic *efx)
 		 */
 		for (i = 0; i < hdr_len && bytes < PAGE_SIZE; i++) {
 			efx->type->mcdi_read_response(efx, &hdr, (i * 4), 4);
-			bytes += scnprintf(buf + bytes, PAGE_SIZE - bytes,
-					   " %08x", le32_to_cpu(hdr.u32[0]));
+			bytes += sysfs_emit_at(buf, bytes, " %08x", le32_to_cpu(hdr.u32[0]));
 		}

 		for (i = 0; i < data_len && bytes < PAGE_SIZE; i++) {
 			efx->type->mcdi_read_response(efx, &hdr,
 					mcdi->resp_hdr_len + (i * 4), 4);
-			bytes += scnprintf(buf + bytes, PAGE_SIZE - bytes,
-					   " %08x", le32_to_cpu(hdr.u32[0]));
+			bytes += sysfs_emit_at(buf, bytes, " %08x", le32_to_cpu(hdr.u32[0]));
 		}

 		netif_info(efx, hw, efx->net_dev, "MCDI RPC RESP:%s\n", buf);