Skip to content

Commit dde8769

Browse files
Thorsten Winklerkuba-moo
authored andcommitted
s390/qeth: Convert sysfs sprintf to sysfs_emit
Following the advice of the Documentation/filesystems/sysfs.rst. All sysfs related show()-functions should only use sysfs_emit() or sysfs_emit_at() when formatting the value to be returned to user space. Reported-by: Jules Irenge <jbi.octave@gmail.com> Reported-by: Joe Perches <joe@perches.com> Reviewed-by: Alexandra Winter <wintera@linux.ibm.com> Signed-off-by: Thorsten Winkler <twinkler@linux.ibm.com> Signed-off-by: Alexandra Winter <wintera@linux.ibm.com> Reviewed-by: Simon Horman <simon.horman@corigine.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 180f513 commit dde8769

File tree

3 files changed

+73
-98
lines changed

3 files changed

+73
-98
lines changed

drivers/s390/net/qeth_core_sys.c

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ static ssize_t qeth_dev_state_show(struct device *dev,
2323

2424
switch (card->state) {
2525
case CARD_STATE_DOWN:
26-
return sprintf(buf, "DOWN\n");
26+
return sysfs_emit(buf, "DOWN\n");
2727
case CARD_STATE_SOFTSETUP:
2828
if (card->dev->flags & IFF_UP)
29-
return sprintf(buf, "UP (LAN %s)\n",
30-
netif_carrier_ok(card->dev) ? "ONLINE" :
31-
"OFFLINE");
32-
return sprintf(buf, "SOFTSETUP\n");
29+
return sysfs_emit(buf, "UP (LAN %s)\n",
30+
netif_carrier_ok(card->dev) ?
31+
"ONLINE" : "OFFLINE");
32+
return sysfs_emit(buf, "SOFTSETUP\n");
3333
default:
34-
return sprintf(buf, "UNKNOWN\n");
34+
return sysfs_emit(buf, "UNKNOWN\n");
3535
}
3636
}
3737

@@ -42,7 +42,7 @@ static ssize_t qeth_dev_chpid_show(struct device *dev,
4242
{
4343
struct qeth_card *card = dev_get_drvdata(dev);
4444

45-
return sprintf(buf, "%02X\n", card->info.chpid);
45+
return sysfs_emit(buf, "%02X\n", card->info.chpid);
4646
}
4747

4848
static DEVICE_ATTR(chpid, 0444, qeth_dev_chpid_show, NULL);
@@ -52,7 +52,7 @@ static ssize_t qeth_dev_if_name_show(struct device *dev,
5252
{
5353
struct qeth_card *card = dev_get_drvdata(dev);
5454

55-
return sprintf(buf, "%s\n", netdev_name(card->dev));
55+
return sysfs_emit(buf, "%s\n", netdev_name(card->dev));
5656
}
5757

5858
static DEVICE_ATTR(if_name, 0444, qeth_dev_if_name_show, NULL);
@@ -62,7 +62,7 @@ static ssize_t qeth_dev_card_type_show(struct device *dev,
6262
{
6363
struct qeth_card *card = dev_get_drvdata(dev);
6464

65-
return sprintf(buf, "%s\n", qeth_get_cardname_short(card));
65+
return sysfs_emit(buf, "%s\n", qeth_get_cardname_short(card));
6666
}
6767

6868
static DEVICE_ATTR(card_type, 0444, qeth_dev_card_type_show, NULL);
@@ -86,7 +86,7 @@ static ssize_t qeth_dev_inbuf_size_show(struct device *dev,
8686
{
8787
struct qeth_card *card = dev_get_drvdata(dev);
8888

89-
return sprintf(buf, "%s\n", qeth_get_bufsize_str(card));
89+
return sysfs_emit(buf, "%s\n", qeth_get_bufsize_str(card));
9090
}
9191

9292
static DEVICE_ATTR(inbuf_size, 0444, qeth_dev_inbuf_size_show, NULL);
@@ -96,7 +96,7 @@ static ssize_t qeth_dev_portno_show(struct device *dev,
9696
{
9797
struct qeth_card *card = dev_get_drvdata(dev);
9898

99-
return sprintf(buf, "%i\n", card->dev->dev_port);
99+
return sysfs_emit(buf, "%i\n", card->dev->dev_port);
100100
}
101101

102102
static ssize_t qeth_dev_portno_store(struct device *dev,
@@ -134,7 +134,7 @@ static DEVICE_ATTR(portno, 0644, qeth_dev_portno_show, qeth_dev_portno_store);
134134
static ssize_t qeth_dev_portname_show(struct device *dev,
135135
struct device_attribute *attr, char *buf)
136136
{
137-
return sprintf(buf, "no portname required\n");
137+
return sysfs_emit(buf, "no portname required\n");
138138
}
139139

140140
static ssize_t qeth_dev_portname_store(struct device *dev,
@@ -157,18 +157,18 @@ static ssize_t qeth_dev_prioqing_show(struct device *dev,
157157

158158
switch (card->qdio.do_prio_queueing) {
159159
case QETH_PRIO_Q_ING_PREC:
160-
return sprintf(buf, "%s\n", "by precedence");
160+
return sysfs_emit(buf, "%s\n", "by precedence");
161161
case QETH_PRIO_Q_ING_TOS:
162-
return sprintf(buf, "%s\n", "by type of service");
162+
return sysfs_emit(buf, "%s\n", "by type of service");
163163
case QETH_PRIO_Q_ING_SKB:
164-
return sprintf(buf, "%s\n", "by skb-priority");
164+
return sysfs_emit(buf, "%s\n", "by skb-priority");
165165
case QETH_PRIO_Q_ING_VLAN:
166-
return sprintf(buf, "%s\n", "by VLAN headers");
166+
return sysfs_emit(buf, "%s\n", "by VLAN headers");
167167
case QETH_PRIO_Q_ING_FIXED:
168-
return sprintf(buf, "always queue %i\n",
168+
return sysfs_emit(buf, "always queue %i\n",
169169
card->qdio.default_out_queue);
170170
default:
171-
return sprintf(buf, "disabled\n");
171+
return sysfs_emit(buf, "disabled\n");
172172
}
173173
}
174174

@@ -242,7 +242,7 @@ static ssize_t qeth_dev_bufcnt_show(struct device *dev,
242242
{
243243
struct qeth_card *card = dev_get_drvdata(dev);
244244

245-
return sprintf(buf, "%i\n", card->qdio.in_buf_pool.buf_count);
245+
return sysfs_emit(buf, "%i\n", card->qdio.in_buf_pool.buf_count);
246246
}
247247

248248
static ssize_t qeth_dev_bufcnt_store(struct device *dev,
@@ -298,7 +298,7 @@ static DEVICE_ATTR(recover, 0200, NULL, qeth_dev_recover_store);
298298
static ssize_t qeth_dev_performance_stats_show(struct device *dev,
299299
struct device_attribute *attr, char *buf)
300300
{
301-
return sprintf(buf, "1\n");
301+
return sysfs_emit(buf, "1\n");
302302
}
303303

304304
static ssize_t qeth_dev_performance_stats_store(struct device *dev,
@@ -335,7 +335,7 @@ static ssize_t qeth_dev_layer2_show(struct device *dev,
335335
{
336336
struct qeth_card *card = dev_get_drvdata(dev);
337337

338-
return sprintf(buf, "%i\n", card->options.layer);
338+
return sysfs_emit(buf, "%i\n", card->options.layer);
339339
}
340340

341341
static ssize_t qeth_dev_layer2_store(struct device *dev,
@@ -470,23 +470,25 @@ static ssize_t qeth_dev_switch_attrs_show(struct device *dev,
470470
int rc = 0;
471471

472472
if (!qeth_card_hw_is_reachable(card))
473-
return sprintf(buf, "n/a\n");
473+
return sysfs_emit(buf, "n/a\n");
474474

475475
rc = qeth_query_switch_attributes(card, &sw_info);
476476
if (rc)
477477
return rc;
478478

479479
if (!sw_info.capabilities)
480-
rc = sprintf(buf, "unknown");
480+
rc = sysfs_emit(buf, "unknown");
481481

482482
if (sw_info.capabilities & QETH_SWITCH_FORW_802_1)
483-
rc = sprintf(buf, (sw_info.settings & QETH_SWITCH_FORW_802_1 ?
484-
"[802.1]" : "802.1"));
483+
rc = sysfs_emit(buf,
484+
(sw_info.settings & QETH_SWITCH_FORW_802_1 ?
485+
"[802.1]" : "802.1"));
485486
if (sw_info.capabilities & QETH_SWITCH_FORW_REFL_RELAY)
486-
rc += sprintf(buf + rc,
487-
(sw_info.settings & QETH_SWITCH_FORW_REFL_RELAY ?
488-
" [rr]" : " rr"));
489-
rc += sprintf(buf + rc, "\n");
487+
rc += sysfs_emit_at(buf, rc,
488+
(sw_info.settings &
489+
QETH_SWITCH_FORW_REFL_RELAY ?
490+
" [rr]" : " rr"));
491+
rc += sysfs_emit_at(buf, rc, "\n");
490492

491493
return rc;
492494
}
@@ -573,7 +575,7 @@ static ssize_t qeth_dev_blkt_total_show(struct device *dev,
573575
{
574576
struct qeth_card *card = dev_get_drvdata(dev);
575577

576-
return sprintf(buf, "%i\n", card->info.blkt.time_total);
578+
return sysfs_emit(buf, "%i\n", card->info.blkt.time_total);
577579
}
578580

579581
static ssize_t qeth_dev_blkt_total_store(struct device *dev,
@@ -593,7 +595,7 @@ static ssize_t qeth_dev_blkt_inter_show(struct device *dev,
593595
{
594596
struct qeth_card *card = dev_get_drvdata(dev);
595597

596-
return sprintf(buf, "%i\n", card->info.blkt.inter_packet);
598+
return sysfs_emit(buf, "%i\n", card->info.blkt.inter_packet);
597599
}
598600

599601
static ssize_t qeth_dev_blkt_inter_store(struct device *dev,
@@ -613,7 +615,7 @@ static ssize_t qeth_dev_blkt_inter_jumbo_show(struct device *dev,
613615
{
614616
struct qeth_card *card = dev_get_drvdata(dev);
615617

616-
return sprintf(buf, "%i\n", card->info.blkt.inter_packet_jumbo);
618+
return sysfs_emit(buf, "%i\n", card->info.blkt.inter_packet_jumbo);
617619
}
618620

619621
static ssize_t qeth_dev_blkt_inter_jumbo_store(struct device *dev,

drivers/s390/net/qeth_l2_sys.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ static ssize_t qeth_bridge_port_role_state_show(struct device *dev,
1919
char *word;
2020

2121
if (!qeth_bridgeport_allowed(card))
22-
return sprintf(buf, "n/a (VNIC characteristics)\n");
22+
return sysfs_emit(buf, "n/a (VNIC characteristics)\n");
2323

2424
mutex_lock(&card->sbp_lock);
2525
if (qeth_card_hw_is_reachable(card) &&
@@ -53,7 +53,7 @@ static ssize_t qeth_bridge_port_role_state_show(struct device *dev,
5353
QETH_CARD_TEXT_(card, 2, "SBP%02x:%02x",
5454
card->options.sbp.role, state);
5555
else
56-
rc = sprintf(buf, "%s\n", word);
56+
rc = sysfs_emit(buf, "%s\n", word);
5757
}
5858
mutex_unlock(&card->sbp_lock);
5959

@@ -66,7 +66,7 @@ static ssize_t qeth_bridge_port_role_show(struct device *dev,
6666
struct qeth_card *card = dev_get_drvdata(dev);
6767

6868
if (!qeth_bridgeport_allowed(card))
69-
return sprintf(buf, "n/a (VNIC characteristics)\n");
69+
return sysfs_emit(buf, "n/a (VNIC characteristics)\n");
7070

7171
return qeth_bridge_port_role_state_show(dev, attr, buf, 0);
7272
}
@@ -117,7 +117,7 @@ static ssize_t qeth_bridge_port_state_show(struct device *dev,
117117
struct qeth_card *card = dev_get_drvdata(dev);
118118

119119
if (!qeth_bridgeport_allowed(card))
120-
return sprintf(buf, "n/a (VNIC characteristics)\n");
120+
return sysfs_emit(buf, "n/a (VNIC characteristics)\n");
121121

122122
return qeth_bridge_port_role_state_show(dev, attr, buf, 1);
123123
}
@@ -132,11 +132,11 @@ static ssize_t qeth_bridgeport_hostnotification_show(struct device *dev,
132132
int enabled;
133133

134134
if (!qeth_bridgeport_allowed(card))
135-
return sprintf(buf, "n/a (VNIC characteristics)\n");
135+
return sysfs_emit(buf, "n/a (VNIC characteristics)\n");
136136

137137
enabled = card->options.sbp.hostnotification;
138138

139-
return sprintf(buf, "%d\n", enabled);
139+
return sysfs_emit(buf, "%d\n", enabled);
140140
}
141141

142142
static ssize_t qeth_bridgeport_hostnotification_store(struct device *dev,
@@ -180,7 +180,7 @@ static ssize_t qeth_bridgeport_reflect_show(struct device *dev,
180180
char *state;
181181

182182
if (!qeth_bridgeport_allowed(card))
183-
return sprintf(buf, "n/a (VNIC characteristics)\n");
183+
return sysfs_emit(buf, "n/a (VNIC characteristics)\n");
184184

185185
if (card->options.sbp.reflect_promisc) {
186186
if (card->options.sbp.reflect_promisc_primary)
@@ -190,7 +190,7 @@ static ssize_t qeth_bridgeport_reflect_show(struct device *dev,
190190
} else
191191
state = "none";
192192

193-
return sprintf(buf, "%s\n", state);
193+
return sysfs_emit(buf, "%s\n", state);
194194
}
195195

196196
static ssize_t qeth_bridgeport_reflect_store(struct device *dev,
@@ -280,10 +280,10 @@ static ssize_t qeth_vnicc_timeout_show(struct device *dev,
280280

281281
rc = qeth_l2_vnicc_get_timeout(card, &timeout);
282282
if (rc == -EBUSY)
283-
return sprintf(buf, "n/a (BridgePort)\n");
283+
return sysfs_emit(buf, "n/a (BridgePort)\n");
284284
if (rc == -EOPNOTSUPP)
285-
return sprintf(buf, "n/a\n");
286-
return rc ? rc : sprintf(buf, "%d\n", timeout);
285+
return sysfs_emit(buf, "n/a\n");
286+
return rc ? rc : sysfs_emit(buf, "%d\n", timeout);
287287
}
288288

289289
/* change timeout setting */
@@ -318,10 +318,10 @@ static ssize_t qeth_vnicc_char_show(struct device *dev,
318318
rc = qeth_l2_vnicc_get_state(card, vnicc, &state);
319319

320320
if (rc == -EBUSY)
321-
return sprintf(buf, "n/a (BridgePort)\n");
321+
return sysfs_emit(buf, "n/a (BridgePort)\n");
322322
if (rc == -EOPNOTSUPP)
323-
return sprintf(buf, "n/a\n");
324-
return rc ? rc : sprintf(buf, "%d\n", state);
323+
return sysfs_emit(buf, "n/a\n");
324+
return rc ? rc : sysfs_emit(buf, "%d\n", state);
325325
}
326326

327327
/* change setting of characteristic */

0 commit comments

Comments
 (0)