scsi: zfcp: Switch over to sysfs_emit()

Per Documentation/filesystems/sysfs.rst, sysfs_emit() is preferred for
presenting attributes to user space in sysfs. Convert the left-over uses
in the zfcp code.

Signed-off-by: Mete Durlu <meted@linux.ibm.com>
Tested-by: Benjamin Block <bblock@linux.ibm.com>
Acked-by: Benjamin Block <bblock@linux.ibm.com>
Reviewed-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

diff --git a/drivers/s390/scsi/zfcp_sysfs.c b/drivers/s390/scsi/zfcp_sysfs.c
index cb67fa80fb12c8cc8694b23f145006627383a9b3..304b81bb5f90c42ca40d0890e06ebe5c75c41b58 100644 (file)
--- a/drivers/s390/scsi/zfcp_sysfs.c
+++ b/drivers/s390/scsi/zfcp_sysfs.c
@@ -24,7 +24,7 @@ static ssize_t zfcp_sysfs_##_feat##_##_name##_show(struct device *dev,               \
 {                                                                             \
        struct _feat_def *_feat = container_of(dev, struct _feat_def, dev);    \
                                                                               \
-       return sprintf(buf, _format, _value);                                  \
+       return sysfs_emit(buf, _format, _value);                               \
 }                                                                             \
 static ZFCP_DEV_ATTR(_feat, _name, S_IRUGO,                                   \
                     zfcp_sysfs_##_feat##_##_name##_show, NULL);
@@ -34,7 +34,7 @@ static ssize_t zfcp_sysfs_##_feat##_##_name##_show(struct device *dev,               \
                                                   struct device_attribute *at,\
                                                   char *buf)                  \
 {                                                                             \
-       return sprintf(buf, _format, _value);                                  \
+       return sysfs_emit(buf, _format, _value);                               \
 }                                                                             \
 static ZFCP_DEV_ATTR(_feat, _name, S_IRUGO,                                   \
                     zfcp_sysfs_##_feat##_##_name##_show, NULL);
@@ -51,7 +51,7 @@ static ssize_t zfcp_sysfs_adapter_##_name##_show(struct device *dev,       \
        if (!adapter)                                                        \
                return -ENODEV;                                              \
                                                                             \
-       i = sprintf(buf, _format, _value);                                   \
+       i = sysfs_emit(buf, _format, _value);                                \
        zfcp_ccw_adapter_put(adapter);                                       \
        return i;                                                            \
 }                                                                           \
@@ -95,9 +95,9 @@ static ssize_t zfcp_sysfs_port_failed_show(struct device *dev,
        struct zfcp_port *port = container_of(dev, struct zfcp_port, dev);
 
        if (atomic_read(&port->status) & ZFCP_STATUS_COMMON_ERP_FAILED)
-               return sprintf(buf, "1\n");
+               return sysfs_emit(buf, "1\n");
 
-       return sprintf(buf, "0\n");
+       return sysfs_emit(buf, "0\n");
 }
 
 static ssize_t zfcp_sysfs_port_failed_store(struct device *dev,
@@ -135,7 +135,7 @@ static ssize_t zfcp_sysfs_unit_failed_show(struct device *dev,
                scsi_device_put(sdev);
        }
 
-       return sprintf(buf, "%d\n", failed);
+       return sysfs_emit(buf, "%d\n", failed);
 }
 
 static ssize_t zfcp_sysfs_unit_failed_store(struct device *dev,
@@ -176,9 +176,9 @@ static ssize_t zfcp_sysfs_adapter_failed_show(struct device *dev,
                return -ENODEV;
 
        if (atomic_read(&adapter->status) & ZFCP_STATUS_COMMON_ERP_FAILED)
-               i = sprintf(buf, "1\n");
+               i = sysfs_emit(buf, "1\n");
        else
-               i = sprintf(buf, "0\n");
+               i = sysfs_emit(buf, "0\n");
 
        zfcp_ccw_adapter_put(adapter);
        return i;
@@ -348,8 +348,7 @@ zfcp_sysfs_adapter_diag_max_age_show(struct device *dev,
        if (!adapter)
                return -ENODEV;
 
-       /* ceil(log(2^64 - 1) / log(10)) = 20 */
-       rc = scnprintf(buf, 20 + 2, "%lu\n", adapter->diagnostics->max_age);
+       rc = sysfs_emit(buf, "%lu\n", adapter->diagnostics->max_age);
 
        zfcp_ccw_adapter_put(adapter);
        return rc;
@@ -401,14 +400,14 @@ static ssize_t zfcp_sysfs_adapter_fc_security_show(
         */
        status = atomic_read(&adapter->status);
        if (0 == (status & ZFCP_STATUS_COMMON_OPEN))
-               i = sprintf(buf, "unknown\n");
+               i = sysfs_emit(buf, "unknown\n");
        else if (!(adapter->adapter_features & FSF_FEATURE_FC_SECURITY))
-               i = sprintf(buf, "unsupported\n");
+               i = sysfs_emit(buf, "unsupported\n");
        else {
                i = zfcp_fsf_scnprint_fc_security(
                        buf, PAGE_SIZE - 1, adapter->fc_security_algorithms,
                        ZFCP_FSF_PRINT_FMT_LIST);
-               i += scnprintf(buf + i, PAGE_SIZE - i, "\n");
+               i += sysfs_emit_at(buf, i, "\n");
        }
 
        zfcp_ccw_adapter_put(adapter);
@@ -490,14 +489,14 @@ static ssize_t zfcp_sysfs_port_fc_security_show(struct device *dev,
            0 != (status & ZFCP_STATUS_PORT_LINK_TEST) ||
            0 != (status & ZFCP_STATUS_COMMON_ERP_FAILED) ||
            0 != (status & ZFCP_STATUS_COMMON_ACCESS_BOXED))
-               i = sprintf(buf, "unknown\n");
+               i = sysfs_emit(buf, "unknown\n");
        else if (!(adapter->adapter_features & FSF_FEATURE_FC_SECURITY))
-               i = sprintf(buf, "unsupported\n");
+               i = sysfs_emit(buf, "unsupported\n");
        else {
                i = zfcp_fsf_scnprint_fc_security(
                        buf, PAGE_SIZE - 1, port->connection_info,
                        ZFCP_FSF_PRINT_FMT_SINGLEITEM);
-               i += scnprintf(buf + i, PAGE_SIZE - i, "\n");
+               i += sysfs_emit_at(buf, i, "\n");
        }
 
        return i;
@@ -569,8 +568,8 @@ zfcp_sysfs_unit_##_name##_latency_show(struct device *dev,          \
        do_div(cmin, 1000);                                             \
        do_div(cmax, 1000);                                             \
                                                                        \
-       return sprintf(buf, "%llu %llu %llu %llu %llu %llu %llu\n",     \
-                      fmin, fmax, fsum, cmin, cmax, csum, cc);         \
+       return sysfs_emit(buf, "%llu %llu %llu %llu %llu %llu %llu\n",  \
+                         fmin, fmax, fsum, cmin, cmax, csum, cc);      \
 }                                                                      \
 static ssize_t                                                         \
 zfcp_sysfs_unit_##_name##_latency_store(struct device *dev,            \
@@ -610,8 +609,8 @@ static ssize_t zfcp_sysfs_scsi_##_name##_show(struct device *dev,   \
        struct scsi_device *sdev = to_scsi_device(dev);                  \
        struct zfcp_scsi_dev *zfcp_sdev = sdev_to_zfcp(sdev);            \
                                                                         \
-       return sprintf(buf, _format, _value);                            \
-}                                                                        \
+       return sysfs_emit(buf, _format, _value);                         \
+}                                                                       \
 static DEVICE_ATTR(_name, S_IRUGO, zfcp_sysfs_scsi_##_name##_show, NULL);
 
 ZFCP_DEFINE_SCSI_ATTR(hba_id, "%s\n",
@@ -625,7 +624,7 @@ static ssize_t zfcp_sysfs_scsi_fcp_lun_show(struct device *dev,
 {
        struct scsi_device *sdev = to_scsi_device(dev);
 
-       return sprintf(buf, "0x%016llx\n", zfcp_scsi_dev_lun(sdev));
+       return sysfs_emit(buf, "0x%016llx\n", zfcp_scsi_dev_lun(sdev));
 }
 static DEVICE_ATTR(fcp_lun, S_IRUGO, zfcp_sysfs_scsi_fcp_lun_show, NULL);
 
@@ -641,7 +640,7 @@ static ssize_t zfcp_sysfs_scsi_zfcp_failed_show(struct device *dev,
        unsigned int status = atomic_read(&sdev_to_zfcp(sdev)->status);
        unsigned int failed = status & ZFCP_STATUS_COMMON_ERP_FAILED ? 1 : 0;
 
-       return sprintf(buf, "%d\n", failed);
+       return sysfs_emit(buf, "%d\n", failed);
 }
 
 static ssize_t zfcp_sysfs_scsi_zfcp_failed_store(struct device *dev,
@@ -714,8 +713,8 @@ static ssize_t zfcp_sysfs_adapter_util_show(struct device *dev,
 
        retval = zfcp_fsf_exchange_port_data_sync(adapter->qdio, qtcb_port);
        if (retval == 0 || retval == -EAGAIN)
-               retval = sprintf(buf, "%u %u %u\n", qtcb_port->cp_util,
-                                qtcb_port->cb_util, qtcb_port->a_util);
+               retval = sysfs_emit(buf, "%u %u %u\n", qtcb_port->cp_util,
+                                   qtcb_port->cb_util, qtcb_port->a_util);
        kfree(qtcb_port);
        return retval;
 }
@@ -758,7 +757,7 @@ static ssize_t zfcp_sysfs_adapter_##_name##_show(struct device *dev,        \
        if (retval)                                                     \
                return retval;                                          \
                                                                        \
-       return sprintf(buf, _format, ## _arg);                          \
+       return sysfs_emit(buf, _format, ## _arg);                       \
 }                                                                      \
 static DEVICE_ATTR(_name, S_IRUGO, zfcp_sysfs_adapter_##_name##_show, NULL);
 
@@ -787,8 +786,8 @@ static ssize_t zfcp_sysfs_adapter_q_full_show(struct device *dev,
        util = qdio->req_q_util;
        spin_unlock_bh(&qdio->stat_lock);
 
-       return sprintf(buf, "%d %llu\n", atomic_read(&qdio->req_q_full),
-                      (unsigned long long)util);
+       return sysfs_emit(buf, "%d %llu\n", atomic_read(&qdio->req_q_full),
+                         (unsigned long long)util);
 }
 static DEVICE_ATTR(queue_full, S_IRUGO, zfcp_sysfs_adapter_q_full_show, NULL);
 
@@ -843,8 +842,7 @@ static ssize_t zfcp_sysfs_adapter_diag_b2b_credit_show(
                                                      .data.nport_serv_param -
                                      sizeof(u32));
 
-       rc = scnprintf(buf, 5 + 2, "%hu\n",
-                      be16_to_cpu(nsp->fl_csp.sp_bb_cred));
+       rc = sysfs_emit(buf, "%hu\n", be16_to_cpu(nsp->fl_csp.sp_bb_cred));
        spin_unlock_irqrestore(&diag_hdr->access_lock, flags);
 
 out:
@@ -854,7 +852,7 @@ out:
 static ZFCP_DEV_ATTR(adapter_diag, b2b_credit, 0400,
                     zfcp_sysfs_adapter_diag_b2b_credit_show, NULL);
 
-#define ZFCP_DEFINE_DIAG_SFP_ATTR(_name, _qtcb_member, _prtsize, _prtfmt)      \
+#define ZFCP_DEFINE_DIAG_SFP_ATTR(_name, _qtcb_member, _prtfmt)                       \
        static ssize_t zfcp_sysfs_adapter_diag_sfp_##_name##_show(             \
                struct device *dev, struct device_attribute *attr, char *buf)  \
        {                                                                      \
@@ -887,8 +885,8 @@ static ZFCP_DEV_ATTR(adapter_diag, b2b_credit, 0400,
                        goto out;                                              \
                                                                               \
                spin_lock_irqsave(&diag_hdr->access_lock, flags);              \
-               rc = scnprintf(                                                \
-                       buf, (_prtsize) + 2, _prtfmt "\n",                     \
+               rc = sysfs_emit(                                               \
+                       buf, _prtfmt "\n",                                     \
                        adapter->diagnostics->port_data.data._qtcb_member);    \
                spin_unlock_irqrestore(&diag_hdr->access_lock, flags);         \
                                                                               \
@@ -899,16 +897,16 @@ static ZFCP_DEV_ATTR(adapter_diag, b2b_credit, 0400,
        static ZFCP_DEV_ATTR(adapter_diag_sfp, _name, 0400,                    \
                             zfcp_sysfs_adapter_diag_sfp_##_name##_show, NULL)
 
-ZFCP_DEFINE_DIAG_SFP_ATTR(temperature, temperature, 6, "%hd");
-ZFCP_DEFINE_DIAG_SFP_ATTR(vcc, vcc, 5, "%hu");
-ZFCP_DEFINE_DIAG_SFP_ATTR(tx_bias, tx_bias, 5, "%hu");
-ZFCP_DEFINE_DIAG_SFP_ATTR(tx_power, tx_power, 5, "%hu");
-ZFCP_DEFINE_DIAG_SFP_ATTR(rx_power, rx_power, 5, "%hu");
-ZFCP_DEFINE_DIAG_SFP_ATTR(port_tx_type, sfp_flags.port_tx_type, 2, "%hu");
-ZFCP_DEFINE_DIAG_SFP_ATTR(optical_port, sfp_flags.optical_port, 1, "%hu");
-ZFCP_DEFINE_DIAG_SFP_ATTR(sfp_invalid, sfp_flags.sfp_invalid, 1, "%hu");
-ZFCP_DEFINE_DIAG_SFP_ATTR(connector_type, sfp_flags.connector_type, 1, "%hu");
-ZFCP_DEFINE_DIAG_SFP_ATTR(fec_active, sfp_flags.fec_active, 1, "%hu");
+ZFCP_DEFINE_DIAG_SFP_ATTR(temperature, temperature, "%hd");
+ZFCP_DEFINE_DIAG_SFP_ATTR(vcc, vcc, "%hu");
+ZFCP_DEFINE_DIAG_SFP_ATTR(tx_bias, tx_bias, "%hu");
+ZFCP_DEFINE_DIAG_SFP_ATTR(tx_power, tx_power, "%hu");
+ZFCP_DEFINE_DIAG_SFP_ATTR(rx_power, rx_power, "%hu");
+ZFCP_DEFINE_DIAG_SFP_ATTR(port_tx_type, sfp_flags.port_tx_type, "%hu");
+ZFCP_DEFINE_DIAG_SFP_ATTR(optical_port, sfp_flags.optical_port, "%hu");
+ZFCP_DEFINE_DIAG_SFP_ATTR(sfp_invalid, sfp_flags.sfp_invalid, "%hu");
+ZFCP_DEFINE_DIAG_SFP_ATTR(connector_type, sfp_flags.connector_type, "%hu");
+ZFCP_DEFINE_DIAG_SFP_ATTR(fec_active, sfp_flags.fec_active, "%hu");
 
 static struct attribute *zfcp_sysfs_diag_attrs[] = {
        &dev_attr_adapter_diag_sfp_temperature.attr,