Skip to contentSkip to conversation

scsi: ibmvfc: use sysfs_emit() to instead of scnprintf()

PATCH In review [email protected] 2 participants 2 messages Nov 14, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 scsi: ibmvfc: use sysfs_emit() to instead of scnprintf()

From: Xu Panda <[email protected]>

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

---
change for v2
- align code
---

---
 drivers/scsi/ibmvscsi/ibmvfc.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)
drivers/scsi/ibmvscsi/ibmvfc.c +8 -12
index 1a0c0b7289d2..841e47c94b12 100644
@@ -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;
 }
Signature · 1 line
2.15.2
Reviewed-by on v2 1/1
#1 lore raw

Le 14/11/2022 à 04:38, [email protected] a écrit :

Quoted 4 lines

[Vous ne recevez pas souvent de courriers de [email protected]. Découvrez pourquoi ceci est important à https://aka.ms/LearnAboutSenderIdentification ]

From: Xu Panda <[email protected]>

Quoted 8 lines

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

---
change for v2
- align code
---

Quoted 86 lines
---
  drivers/scsi/ibmvscsi/ibmvfc.c | 20 ++++++++------------
  1 file changed, 8 insertions(+), 12 deletions(-)
drivers/scsi/ibmvscsi/ibmvfc.c +8 -13
index 1a0c0b7289d2..841e47c94b12 100644
@@ -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