| Message ID | b4c150c86f539d3bac3fc8885252adb9f24ee48f.1644286482.git.yang.guang5@zte.com.cn (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | scsi: ibmvfc: replace snprintf with sysfs_emit | expand |
On Wed, 2022-02-09 at 08:43 +0800, davidcomponentone@gmail.com wrote: > From: Yang Guang <yang.guang5@zte.com.cn> [] > diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c [] > @@ -3403,7 +3403,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", > + return sysfs_emit(buf, "%s\n", > vhost->login_buf->resp.partition_name); Rewrap please return sysfs_emit(buf, "%s\n", vhost->login_buf->resp.partition_name); > } > > @@ -3413,7 +3413,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", > + return sysfs_emit(buf, "%s\n", > vhost->login_buf->resp.device_name); etc...
On 2/9/22 09:43, davidcomponentone@gmail.com wrote: > From: Yang Guang <yang.guang5@zte.com.cn> > > coccinelle report: > ./drivers/scsi/ibmvscsi/ibmvfc.c:3453:8-16: > WARNING: use scnprintf or sprintf > ./drivers/scsi/ibmvscsi/ibmvfc.c:3416:8-16: > WARNING: use scnprintf or sprintf > ./drivers/scsi/ibmvscsi/ibmvfc.c:3436:8-16: > WARNING: use scnprintf or sprintf > ./drivers/scsi/ibmvscsi/ibmvfc.c:3426:8-16: > WARNING: use scnprintf or sprintf > ./drivers/scsi/ibmvscsi/ibmvfc.c:3445:8-16: > WARNING: use scnprintf or sprintf > ./drivers/scsi/ibmvscsi/ibmvfc.c:3406:8-16: > WARNING: use scnprintf or sprintf > > Use sysfs_emit instead of scnprintf or sprintf makes more sense. > > Reported-by: Zeal Robot <zealci@zte.com.cn> > Signed-off-by: Yang Guang <yang.guang5@zte.com.cn> > Signed-off-by: David Yang <davidcomponentone@gmail.com> > --- > drivers/scsi/ibmvscsi/ibmvfc.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c > index d0eab5700dc5..d5a197d17e0a 100644 > --- a/drivers/scsi/ibmvscsi/ibmvfc.c > +++ b/drivers/scsi/ibmvscsi/ibmvfc.c > @@ -3403,7 +3403,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", > + return sysfs_emit(buf, "%s\n", > vhost->login_buf->resp.partition_name); > } > > @@ -3413,7 +3413,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", > + return sysfs_emit(buf, "%s\n", > vhost->login_buf->resp.device_name); > } > > @@ -3423,7 +3423,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", > + return sysfs_emit(buf, "%s\n", > vhost->login_buf->resp.port_loc_code); > } > > @@ -3433,7 +3433,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", > + return sysfs_emit(buf, "%s\n", > vhost->login_buf->resp.drc_name); > } > > @@ -3442,7 +3442,7 @@ 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)); The format should be %u, not %d. And while at it, please add a blank line after the declarations. > } > > static ssize_t ibmvfc_show_host_capabilities(struct device *dev, > @@ -3450,7 +3450,7 @@ 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)); > } Ditto for the blank line. > > /** > @@ -3471,7 +3471,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; > } > @@ -3509,7 +3509,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", vhost->client_scsi_channels); > + len = sysfs_emit(buf, "%d\n", vhost->client_scsi_channels); > spin_unlock_irqrestore(shost->host_lock, flags); > return len; > }
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c index d0eab5700dc5..d5a197d17e0a 100644 --- a/drivers/scsi/ibmvscsi/ibmvfc.c +++ b/drivers/scsi/ibmvscsi/ibmvfc.c @@ -3403,7 +3403,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", + return sysfs_emit(buf, "%s\n", vhost->login_buf->resp.partition_name); } @@ -3413,7 +3413,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", + return sysfs_emit(buf, "%s\n", vhost->login_buf->resp.device_name); } @@ -3423,7 +3423,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", + return sysfs_emit(buf, "%s\n", vhost->login_buf->resp.port_loc_code); } @@ -3433,7 +3433,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", + return sysfs_emit(buf, "%s\n", vhost->login_buf->resp.drc_name); } @@ -3442,7 +3442,7 @@ 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, @@ -3450,7 +3450,7 @@ 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)); } /** @@ -3471,7 +3471,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; } @@ -3509,7 +3509,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", vhost->client_scsi_channels); + len = sysfs_emit(buf, "%d\n", vhost->client_scsi_channels); spin_unlock_irqrestore(shost->host_lock, flags); return len; }