Commit 29ff822f authored by Li Zhijian's avatar Li Zhijian Committed by Martin K. Petersen
Browse files

scsi: ibmvscsi: Convert 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().

> ./drivers/scsi/ibmvscsi/ibmvfc.c:3483:8-16: WARNING: please use sysfs_emit
> ./drivers/scsi/ibmvscsi/ibmvfc.c:3493:8-16: WARNING: please use sysfs_emit
> ./drivers/scsi/ibmvscsi/ibmvfc.c:3503:8-16: WARNING: please use sysfs_emit
> ./drivers/scsi/ibmvscsi/ibmvfc.c:3513:8-16: WARNING: please use sysfs_emit
> ./drivers/scsi/ibmvscsi/ibmvfc.c:3522:8-16: WARNING: please use sysfs_emit
> ./drivers/scsi/ibmvscsi/ibmvfc.c:3530:8-16: WARNING: please use sysfs_emit

No functional change intended

CC: Tyrel Datwyler <tyreld@linux.ibm.com>
CC: Michael Ellerman <mpe@ellerman.id.au>
CC: Nicholas Piggin <npiggin@gmail.com>
CC: Christophe Leroy <christophe.leroy@csgroup.eu>
CC: Aneesh Kumar K.V <aneesh.kumar@kernel.org>
CC: Naveen N. Rao <naveen.n.rao@linux.ibm.com>
CC: James E.J. Bottomley <jejb@linux.ibm.com>
CC: Martin K. Petersen <martin.petersen@oracle.com>
CC: linux-scsi@vger.kernel.org
CC: linuxppc-dev@lists.ozlabs.org
Signed-off-by: default avatarLi Zhijian <lizhijian@fujitsu.com>
Link: https://lore.kernel.org/r/20240116045151.3940401-23-lizhijian@fujitsu.com


Acked-by: default avatarTyrel Datwyler <tyreld@linux.ibm.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 1ad717c9

drivers/scsi/ibmvscsi/ibmvfc.c

+10 −12
Original line number Diff line number Diff line
@@ -3482,8 +3482,7 @@ static ssize_t ibmvfc_show_host_partition_name(struct device *dev, 
	struct Scsi_Host *shost = class_to_shost(dev);

	struct ibmvfc_host *vhost = shost_priv(shost);



	return snprintf(buf, PAGE_SIZE, "%s\n",

			vhost->login_buf->resp.partition_name);

	return sysfs_emit(buf, "%s\n", vhost->login_buf->resp.partition_name);

}



static ssize_t ibmvfc_show_host_device_name(struct device *dev,
@@ -3492,8 +3491,7 @@ static ssize_t ibmvfc_show_host_device_name(struct device *dev, 
	struct Scsi_Host *shost = class_to_shost(dev);

	struct ibmvfc_host *vhost = shost_priv(shost);



	return snprintf(buf, PAGE_SIZE, "%s\n",

			vhost->login_buf->resp.device_name);

	return sysfs_emit(buf, "%s\n", vhost->login_buf->resp.device_name);

}



static ssize_t ibmvfc_show_host_loc_code(struct device *dev,
@@ -3502,8 +3500,7 @@ static ssize_t ibmvfc_show_host_loc_code(struct device *dev, 
	struct Scsi_Host *shost = class_to_shost(dev);

	struct ibmvfc_host *vhost = shost_priv(shost);



	return snprintf(buf, PAGE_SIZE, "%s\n",

			vhost->login_buf->resp.port_loc_code);

	return sysfs_emit(buf, "%s\n", vhost->login_buf->resp.port_loc_code);

}



static ssize_t ibmvfc_show_host_drc_name(struct device *dev,
@@ -3512,8 +3509,7 @@ static ssize_t ibmvfc_show_host_drc_name(struct device *dev, 
	struct Scsi_Host *shost = class_to_shost(dev);

	struct ibmvfc_host *vhost = shost_priv(shost);



	return snprintf(buf, PAGE_SIZE, "%s\n",

			vhost->login_buf->resp.drc_name);

	return sysfs_emit(buf, "%s\n", vhost->login_buf->resp.drc_name);

}



static ssize_t ibmvfc_show_host_npiv_version(struct device *dev,
@@ -3521,7 +3517,8 @@ static ssize_t ibmvfc_show_host_npiv_version(struct device *dev, 
{

	struct Scsi_Host *shost = class_to_shost(dev);

	struct ibmvfc_host *vhost = shost_priv(shost);

	return snprintf(buf, PAGE_SIZE, "%d\n", be32_to_cpu(vhost->login_buf->resp.version));

	return sysfs_emit(buf, "%d\n",

			  be32_to_cpu(vhost->login_buf->resp.version));

}



static ssize_t ibmvfc_show_host_capabilities(struct device *dev,
@@ -3529,7 +3526,8 @@ static ssize_t ibmvfc_show_host_capabilities(struct device *dev, 
{

	struct Scsi_Host *shost = class_to_shost(dev);

	struct ibmvfc_host *vhost = shost_priv(shost);

	return snprintf(buf, PAGE_SIZE, "%llx\n", be64_to_cpu(vhost->login_buf->resp.capabilities));

	return sysfs_emit(buf, "%llx\n",

			  be64_to_cpu(vhost->login_buf->resp.capabilities));

}



/**
@@ -3550,7 +3548,7 @@ static ssize_t ibmvfc_show_log_level(struct device *dev, 
	int len;



	spin_lock_irqsave(shost->host_lock, flags);

	len = snprintf(buf, PAGE_SIZE, "%d\n", vhost->log_level);

	len = sysfs_emit(buf, "%d\n", vhost->log_level);

	spin_unlock_irqrestore(shost->host_lock, flags);

	return len;

}
@@ -3589,7 +3587,7 @@ static ssize_t ibmvfc_show_scsi_channels(struct device *dev, 
	int len;



	spin_lock_irqsave(shost->host_lock, flags);

	len = snprintf(buf, PAGE_SIZE, "%d\n", scsi->desired_queues);

	len = sysfs_emit(buf, "%d\n", scsi->desired_queues);

	spin_unlock_irqrestore(shost->host_lock, flags);

	return len;

}