Skip to content

Commit 9b1808b

Browse files
author
Mete Durlu
committed
scsi: zfcp: Switch over to sysfs_emit()
JIRA: https://issues.redhat.com/browse/RHEL-73492 commit 0aa4daa Author: Mete Durlu <meted@linux.ibm.com> Date: Wed Oct 23 14:11:01 2024 +0200 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> Signed-off-by: Mete Durlu <mdurlu@redhat.com>
1 parent 3fc43c5 commit 9b1808b

File tree

1 file changed

+40
-42
lines changed

1 file changed

+40
-42
lines changed

‎drivers/s390/scsi/zfcp_sysfs.c‎

Lines changed: 40 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ static ssize_t zfcp_sysfs_##_feat##_##_name##_show(struct device *dev, \
2424
{ \
2525
struct _feat_def *_feat = container_of(dev, struct _feat_def, dev); \
2626
\
27-
return sprintf(buf, _format, _value); \
27+
return sysfs_emit(buf, _format, _value); \
2828
} \
2929
static ZFCP_DEV_ATTR(_feat, _name, S_IRUGO, \
3030
zfcp_sysfs_##_feat##_##_name##_show, NULL);
@@ -34,7 +34,7 @@ static ssize_t zfcp_sysfs_##_feat##_##_name##_show(struct device *dev, \
3434
struct device_attribute *at,\
3535
char *buf) \
3636
{ \
37-
return sprintf(buf, _format, _value); \
37+
return sysfs_emit(buf, _format, _value); \
3838
} \
3939
static ZFCP_DEV_ATTR(_feat, _name, S_IRUGO, \
4040
zfcp_sysfs_##_feat##_##_name##_show, NULL);
@@ -51,7 +51,7 @@ static ssize_t zfcp_sysfs_adapter_##_name##_show(struct device *dev, \
5151
if (!adapter) \
5252
return -ENODEV; \
5353
\
54-
i = sprintf(buf, _format, _value); \
54+
i = sysfs_emit(buf, _format, _value); \
5555
zfcp_ccw_adapter_put(adapter); \
5656
return i; \
5757
} \
@@ -95,9 +95,9 @@ static ssize_t zfcp_sysfs_port_failed_show(struct device *dev,
9595
struct zfcp_port *port = container_of(dev, struct zfcp_port, dev);
9696

9797
if (atomic_read(&port->status) & ZFCP_STATUS_COMMON_ERP_FAILED)
98-
return sprintf(buf, "1\n");
98+
return sysfs_emit(buf, "1\n");
9999

100-
return sprintf(buf, "0\n");
100+
return sysfs_emit(buf, "0\n");
101101
}
102102

103103
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,
135135
scsi_device_put(sdev);
136136
}
137137

138-
return sprintf(buf, "%d\n", failed);
138+
return sysfs_emit(buf, "%d\n", failed);
139139
}
140140

141141
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,
176176
return -ENODEV;
177177

178178
if (atomic_read(&adapter->status) & ZFCP_STATUS_COMMON_ERP_FAILED)
179-
i = sprintf(buf, "1\n");
179+
i = sysfs_emit(buf, "1\n");
180180
else
181-
i = sprintf(buf, "0\n");
181+
i = sysfs_emit(buf, "0\n");
182182

183183
zfcp_ccw_adapter_put(adapter);
184184
return i;
@@ -348,8 +348,7 @@ zfcp_sysfs_adapter_diag_max_age_show(struct device *dev,
348348
if (!adapter)
349349
return -ENODEV;
350350

351-
/* ceil(log(2^64 - 1) / log(10)) = 20 */
352-
rc = scnprintf(buf, 20 + 2, "%lu\n", adapter->diagnostics->max_age);
351+
rc = sysfs_emit(buf, "%lu\n", adapter->diagnostics->max_age);
353352

354353
zfcp_ccw_adapter_put(adapter);
355354
return rc;
@@ -401,14 +400,14 @@ static ssize_t zfcp_sysfs_adapter_fc_security_show(
401400
*/
402401
status = atomic_read(&adapter->status);
403402
if (0 == (status & ZFCP_STATUS_COMMON_OPEN))
404-
i = sprintf(buf, "unknown\n");
403+
i = sysfs_emit(buf, "unknown\n");
405404
else if (!(adapter->adapter_features & FSF_FEATURE_FC_SECURITY))
406-
i = sprintf(buf, "unsupported\n");
405+
i = sysfs_emit(buf, "unsupported\n");
407406
else {
408407
i = zfcp_fsf_scnprint_fc_security(
409408
buf, PAGE_SIZE - 1, adapter->fc_security_algorithms,
410409
ZFCP_FSF_PRINT_FMT_LIST);
411-
i += scnprintf(buf + i, PAGE_SIZE - i, "\n");
410+
i += sysfs_emit_at(buf, i, "\n");
412411
}
413412

414413
zfcp_ccw_adapter_put(adapter);
@@ -490,14 +489,14 @@ static ssize_t zfcp_sysfs_port_fc_security_show(struct device *dev,
490489
0 != (status & ZFCP_STATUS_PORT_LINK_TEST) ||
491490
0 != (status & ZFCP_STATUS_COMMON_ERP_FAILED) ||
492491
0 != (status & ZFCP_STATUS_COMMON_ACCESS_BOXED))
493-
i = sprintf(buf, "unknown\n");
492+
i = sysfs_emit(buf, "unknown\n");
494493
else if (!(adapter->adapter_features & FSF_FEATURE_FC_SECURITY))
495-
i = sprintf(buf, "unsupported\n");
494+
i = sysfs_emit(buf, "unsupported\n");
496495
else {
497496
i = zfcp_fsf_scnprint_fc_security(
498497
buf, PAGE_SIZE - 1, port->connection_info,
499498
ZFCP_FSF_PRINT_FMT_SINGLEITEM);
500-
i += scnprintf(buf + i, PAGE_SIZE - i, "\n");
499+
i += sysfs_emit_at(buf, i, "\n");
501500
}
502501

503502
return i;
@@ -569,8 +568,8 @@ zfcp_sysfs_unit_##_name##_latency_show(struct device *dev, \
569568
do_div(cmin, 1000); \
570569
do_div(cmax, 1000); \
571570
\
572-
return sprintf(buf, "%llu %llu %llu %llu %llu %llu %llu\n", \
573-
fmin, fmax, fsum, cmin, cmax, csum, cc); \
571+
return sysfs_emit(buf, "%llu %llu %llu %llu %llu %llu %llu\n", \
572+
fmin, fmax, fsum, cmin, cmax, csum, cc); \
574573
} \
575574
static ssize_t \
576575
zfcp_sysfs_unit_##_name##_latency_store(struct device *dev, \
@@ -610,8 +609,8 @@ static ssize_t zfcp_sysfs_scsi_##_name##_show(struct device *dev, \
610609
struct scsi_device *sdev = to_scsi_device(dev); \
611610
struct zfcp_scsi_dev *zfcp_sdev = sdev_to_zfcp(sdev); \
612611
\
613-
return sprintf(buf, _format, _value); \
614-
} \
612+
return sysfs_emit(buf, _format, _value); \
613+
} \
615614
static DEVICE_ATTR(_name, S_IRUGO, zfcp_sysfs_scsi_##_name##_show, NULL);
616615

617616
ZFCP_DEFINE_SCSI_ATTR(hba_id, "%s\n",
@@ -625,7 +624,7 @@ static ssize_t zfcp_sysfs_scsi_fcp_lun_show(struct device *dev,
625624
{
626625
struct scsi_device *sdev = to_scsi_device(dev);
627626

628-
return sprintf(buf, "0x%016llx\n", zfcp_scsi_dev_lun(sdev));
627+
return sysfs_emit(buf, "0x%016llx\n", zfcp_scsi_dev_lun(sdev));
629628
}
630629
static DEVICE_ATTR(fcp_lun, S_IRUGO, zfcp_sysfs_scsi_fcp_lun_show, NULL);
631630

@@ -641,7 +640,7 @@ static ssize_t zfcp_sysfs_scsi_zfcp_failed_show(struct device *dev,
641640
unsigned int status = atomic_read(&sdev_to_zfcp(sdev)->status);
642641
unsigned int failed = status & ZFCP_STATUS_COMMON_ERP_FAILED ? 1 : 0;
643642

644-
return sprintf(buf, "%d\n", failed);
643+
return sysfs_emit(buf, "%d\n", failed);
645644
}
646645

647646
static ssize_t zfcp_sysfs_scsi_zfcp_failed_store(struct device *dev,
@@ -705,8 +704,8 @@ static ssize_t zfcp_sysfs_adapter_util_show(struct device *dev,
705704

706705
retval = zfcp_fsf_exchange_port_data_sync(adapter->qdio, qtcb_port);
707706
if (retval == 0 || retval == -EAGAIN)
708-
retval = sprintf(buf, "%u %u %u\n", qtcb_port->cp_util,
709-
qtcb_port->cb_util, qtcb_port->a_util);
707+
retval = sysfs_emit(buf, "%u %u %u\n", qtcb_port->cp_util,
708+
qtcb_port->cb_util, qtcb_port->a_util);
710709
kfree(qtcb_port);
711710
return retval;
712711
}
@@ -749,7 +748,7 @@ static ssize_t zfcp_sysfs_adapter_##_name##_show(struct device *dev, \
749748
if (retval) \
750749
return retval; \
751750
\
752-
return sprintf(buf, _format, ## _arg); \
751+
return sysfs_emit(buf, _format, ## _arg); \
753752
} \
754753
static DEVICE_ATTR(_name, S_IRUGO, zfcp_sysfs_adapter_##_name##_show, NULL);
755754

@@ -778,8 +777,8 @@ static ssize_t zfcp_sysfs_adapter_q_full_show(struct device *dev,
778777
util = qdio->req_q_util;
779778
spin_unlock_bh(&qdio->stat_lock);
780779

781-
return sprintf(buf, "%d %llu\n", atomic_read(&qdio->req_q_full),
782-
(unsigned long long)util);
780+
return sysfs_emit(buf, "%d %llu\n", atomic_read(&qdio->req_q_full),
781+
(unsigned long long)util);
783782
}
784783
static DEVICE_ATTR(queue_full, S_IRUGO, zfcp_sysfs_adapter_q_full_show, NULL);
785784

@@ -825,8 +824,7 @@ static ssize_t zfcp_sysfs_adapter_diag_b2b_credit_show(
825824
.data.nport_serv_param -
826825
sizeof(u32));
827826

828-
rc = scnprintf(buf, 5 + 2, "%hu\n",
829-
be16_to_cpu(nsp->fl_csp.sp_bb_cred));
827+
rc = sysfs_emit(buf, "%hu\n", be16_to_cpu(nsp->fl_csp.sp_bb_cred));
830828
spin_unlock_irqrestore(&diag_hdr->access_lock, flags);
831829

832830
out:
@@ -836,7 +834,7 @@ static ssize_t zfcp_sysfs_adapter_diag_b2b_credit_show(
836834
static ZFCP_DEV_ATTR(adapter_diag, b2b_credit, 0400,
837835
zfcp_sysfs_adapter_diag_b2b_credit_show, NULL);
838836

839-
#define ZFCP_DEFINE_DIAG_SFP_ATTR(_name, _qtcb_member, _prtsize, _prtfmt) \
837+
#define ZFCP_DEFINE_DIAG_SFP_ATTR(_name, _qtcb_member, _prtfmt) \
840838
static ssize_t zfcp_sysfs_adapter_diag_sfp_##_name##_show( \
841839
struct device *dev, struct device_attribute *attr, char *buf) \
842840
{ \
@@ -869,8 +867,8 @@ static ZFCP_DEV_ATTR(adapter_diag, b2b_credit, 0400,
869867
goto out; \
870868
\
871869
spin_lock_irqsave(&diag_hdr->access_lock, flags); \
872-
rc = scnprintf( \
873-
buf, (_prtsize) + 2, _prtfmt "\n", \
870+
rc = sysfs_emit( \
871+
buf, _prtfmt "\n", \
874872
adapter->diagnostics->port_data.data._qtcb_member); \
875873
spin_unlock_irqrestore(&diag_hdr->access_lock, flags); \
876874
\
@@ -881,16 +879,16 @@ static ZFCP_DEV_ATTR(adapter_diag, b2b_credit, 0400,
881879
static ZFCP_DEV_ATTR(adapter_diag_sfp, _name, 0400, \
882880
zfcp_sysfs_adapter_diag_sfp_##_name##_show, NULL)
883881

884-
ZFCP_DEFINE_DIAG_SFP_ATTR(temperature, temperature, 6, "%hd");
885-
ZFCP_DEFINE_DIAG_SFP_ATTR(vcc, vcc, 5, "%hu");
886-
ZFCP_DEFINE_DIAG_SFP_ATTR(tx_bias, tx_bias, 5, "%hu");
887-
ZFCP_DEFINE_DIAG_SFP_ATTR(tx_power, tx_power, 5, "%hu");
888-
ZFCP_DEFINE_DIAG_SFP_ATTR(rx_power, rx_power, 5, "%hu");
889-
ZFCP_DEFINE_DIAG_SFP_ATTR(port_tx_type, sfp_flags.port_tx_type, 2, "%hu");
890-
ZFCP_DEFINE_DIAG_SFP_ATTR(optical_port, sfp_flags.optical_port, 1, "%hu");
891-
ZFCP_DEFINE_DIAG_SFP_ATTR(sfp_invalid, sfp_flags.sfp_invalid, 1, "%hu");
892-
ZFCP_DEFINE_DIAG_SFP_ATTR(connector_type, sfp_flags.connector_type, 1, "%hu");
893-
ZFCP_DEFINE_DIAG_SFP_ATTR(fec_active, sfp_flags.fec_active, 1, "%hu");
882+
ZFCP_DEFINE_DIAG_SFP_ATTR(temperature, temperature, "%hd");
883+
ZFCP_DEFINE_DIAG_SFP_ATTR(vcc, vcc, "%hu");
884+
ZFCP_DEFINE_DIAG_SFP_ATTR(tx_bias, tx_bias, "%hu");
885+
ZFCP_DEFINE_DIAG_SFP_ATTR(tx_power, tx_power, "%hu");
886+
ZFCP_DEFINE_DIAG_SFP_ATTR(rx_power, rx_power, "%hu");
887+
ZFCP_DEFINE_DIAG_SFP_ATTR(port_tx_type, sfp_flags.port_tx_type, "%hu");
888+
ZFCP_DEFINE_DIAG_SFP_ATTR(optical_port, sfp_flags.optical_port, "%hu");
889+
ZFCP_DEFINE_DIAG_SFP_ATTR(sfp_invalid, sfp_flags.sfp_invalid, "%hu");
890+
ZFCP_DEFINE_DIAG_SFP_ATTR(connector_type, sfp_flags.connector_type, "%hu");
891+
ZFCP_DEFINE_DIAG_SFP_ATTR(fec_active, sfp_flags.fec_active, "%hu");
894892

895893
static struct attribute *zfcp_sysfs_diag_attrs[] = {
896894
&dev_attr_adapter_diag_sfp_temperature.attr,

0 commit comments

Comments
 (0)