From: Xu Panda <xu.pa...@zte.com.cn>

Replace the open-code with sysfs_emit() to simplify the code.

---
change for v2
 - align code
---
Signed-off-by: Xu Panda <xu.pa...@zte.com.cn>
Signed-off-by: Yang Yang <yang.yan...@zte.com>
---
 drivers/scsi/ibmvscsi/ibmvfc.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index 1a0c0b7289d2..841e47c94b12 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -3411,8 +3411,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,
@@ -3421,8 +3420,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,
@@ -3431,8 +3429,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,
@@ -3441,8 +3438,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,
@@ -3450,7 +3446,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,
@@ -3458,7 +3454,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));
 }

 /**
@@ -3479,7 +3475,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;
 }
@@ -3517,7 +3513,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;
 }
-- 
2.15.2

Reply via email to