Skip to content

Commit a441f3b

Browse files
ye xingchensre
ye xingchen
authored and
sre
committed
power: supply: use sysfs_emit() instead of sprintf() for sysfs show()
As documented in Documentation/filesystems/sysfs.rst the sysfs show() function should use sysfs_emit() or sysfs_emit_at() to format the userspace return value. This replaces all sysfs related instances of sprintf() with sysfs_emit() in the power-supply subsystem. Signed-off-by: ye xingchen <ye.xingchen@zte.com.cn> [Drop sysfs_emit changes done for code not related to sysfs show and reword commit message] Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
1 parent 35aa062 commit a441f3b

11 files changed

Lines changed: 51 additions & 51 deletions

‎drivers/power/supply/ab8500_fg.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2453,7 +2453,7 @@ struct ab8500_fg_sysfs_entry {
24532453

24542454
static ssize_t charge_full_show(struct ab8500_fg *di, char *buf)
24552455
{
2456-
return sprintf(buf, "%d\n", di->bat_cap.max_mah);
2456+
return sysfs_emit(buf, "%d\n", di->bat_cap.max_mah);
24572457
}
24582458

24592459
static ssize_t charge_full_store(struct ab8500_fg *di, const char *buf,
@@ -2472,7 +2472,7 @@ static ssize_t charge_full_store(struct ab8500_fg *di, const char *buf,
24722472

24732473
static ssize_t charge_now_show(struct ab8500_fg *di, char *buf)
24742474
{
2475-
return sprintf(buf, "%d\n", di->bat_cap.prev_mah);
2475+
return sysfs_emit(buf, "%d\n", di->bat_cap.prev_mah);
24762476
}
24772477

24782478
static ssize_t charge_now_store(struct ab8500_fg *di, const char *buf,

‎drivers/power/supply/bq2415x_charger.c‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,7 +1059,7 @@ static ssize_t bq2415x_sysfs_show_status(struct device *dev,
10591059
ret = bq2415x_exec_command(bq, command);
10601060
if (ret < 0)
10611061
return ret;
1062-
return sprintf(buf, "%d\n", ret);
1062+
return sysfs_emit(buf, "%d\n", ret);
10631063
}
10641064

10651065
/*
@@ -1098,11 +1098,11 @@ static ssize_t bq2415x_sysfs_show_timer(struct device *dev,
10981098
struct bq2415x_device *bq = power_supply_get_drvdata(psy);
10991099

11001100
if (bq->timer_error)
1101-
return sprintf(buf, "%s\n", bq->timer_error);
1101+
return sysfs_emit(buf, "%s\n", bq->timer_error);
11021102

11031103
if (bq->autotimer)
1104-
return sprintf(buf, "auto\n");
1105-
return sprintf(buf, "off\n");
1104+
return sysfs_emit(buf, "auto\n");
1105+
return sysfs_emit(buf, "off\n");
11061106
}
11071107

11081108
/*
@@ -1175,30 +1175,30 @@ static ssize_t bq2415x_sysfs_show_mode(struct device *dev,
11751175
ssize_t ret = 0;
11761176

11771177
if (bq->automode > 0)
1178-
ret += sprintf(buf+ret, "auto (");
1178+
ret += sysfs_emit_at(buf, ret, "auto (");
11791179

11801180
switch (bq->mode) {
11811181
case BQ2415X_MODE_OFF:
1182-
ret += sprintf(buf+ret, "off");
1182+
ret += sysfs_emit_at(buf, ret, "off");
11831183
break;
11841184
case BQ2415X_MODE_NONE:
1185-
ret += sprintf(buf+ret, "none");
1185+
ret += sysfs_emit_at(buf, ret, "none");
11861186
break;
11871187
case BQ2415X_MODE_HOST_CHARGER:
1188-
ret += sprintf(buf+ret, "host");
1188+
ret += sysfs_emit_at(buf, ret, "host");
11891189
break;
11901190
case BQ2415X_MODE_DEDICATED_CHARGER:
1191-
ret += sprintf(buf+ret, "dedicated");
1191+
ret += sysfs_emit_at(buf, ret, "dedicated");
11921192
break;
11931193
case BQ2415X_MODE_BOOST:
1194-
ret += sprintf(buf+ret, "boost");
1194+
ret += sysfs_emit_at(buf, ret, "boost");
11951195
break;
11961196
}
11971197

11981198
if (bq->automode > 0)
1199-
ret += sprintf(buf+ret, ")");
1199+
ret += sysfs_emit_at(buf, ret, ")");
12001200

1201-
ret += sprintf(buf+ret, "\n");
1201+
ret += sysfs_emit_at(buf, ret, "\n");
12021202
return ret;
12031203
}
12041204

@@ -1215,15 +1215,15 @@ static ssize_t bq2415x_sysfs_show_reported_mode(struct device *dev,
12151215

12161216
switch (bq->reported_mode) {
12171217
case BQ2415X_MODE_OFF:
1218-
return sprintf(buf, "off\n");
1218+
return sysfs_emit(buf, "off\n");
12191219
case BQ2415X_MODE_NONE:
1220-
return sprintf(buf, "none\n");
1220+
return sysfs_emit(buf, "none\n");
12211221
case BQ2415X_MODE_HOST_CHARGER:
1222-
return sprintf(buf, "host\n");
1222+
return sysfs_emit(buf, "host\n");
12231223
case BQ2415X_MODE_DEDICATED_CHARGER:
1224-
return sprintf(buf, "dedicated\n");
1224+
return sysfs_emit(buf, "dedicated\n");
12251225
case BQ2415X_MODE_BOOST:
1226-
return sprintf(buf, "boost\n");
1226+
return sysfs_emit(buf, "boost\n");
12271227
}
12281228

12291229
return -EINVAL;
@@ -1261,8 +1261,8 @@ static ssize_t bq2415x_sysfs_print_reg(struct bq2415x_device *bq,
12611261
int ret = bq2415x_i2c_read(bq, reg);
12621262

12631263
if (ret < 0)
1264-
return sprintf(buf, "%#.2x=error %d\n", reg, ret);
1265-
return sprintf(buf, "%#.2x=%#.2x\n", reg, ret);
1264+
return sysfs_emit(buf, "%#.2x=error %d\n", reg, ret);
1265+
return sysfs_emit(buf, "%#.2x=%#.2x\n", reg, ret);
12661266
}
12671267

12681268
/* show all raw values of chip register, format per line: 'register=value' */
@@ -1338,7 +1338,7 @@ static ssize_t bq2415x_sysfs_show_limit(struct device *dev,
13381338

13391339
if (ret < 0)
13401340
return ret;
1341-
return sprintf(buf, "%d\n", ret);
1341+
return sysfs_emit(buf, "%d\n", ret);
13421342
}
13431343

13441344
/* set *_enable entries */
@@ -1401,7 +1401,7 @@ static ssize_t bq2415x_sysfs_show_enable(struct device *dev,
14011401
ret = bq2415x_exec_command(bq, command);
14021402
if (ret < 0)
14031403
return ret;
1404-
return sprintf(buf, "%d\n", ret);
1404+
return sysfs_emit(buf, "%d\n", ret);
14051405
}
14061406

14071407
static DEVICE_ATTR(current_limit, S_IWUSR | S_IRUGO,

‎drivers/power/supply/charger-manager.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1075,7 +1075,7 @@ static ssize_t charger_name_show(struct device *dev,
10751075
struct charger_regulator *charger
10761076
= container_of(attr, struct charger_regulator, attr_name);
10771077

1078-
return sprintf(buf, "%s\n", charger->regulator_name);
1078+
return sysfs_emit(buf, "%s\n", charger->regulator_name);
10791079
}
10801080

10811081
static ssize_t charger_state_show(struct device *dev,
@@ -1088,7 +1088,7 @@ static ssize_t charger_state_show(struct device *dev,
10881088
if (!charger->externally_control)
10891089
state = regulator_is_enabled(charger->consumer);
10901090

1091-
return sprintf(buf, "%s\n", state ? "enabled" : "disabled");
1091+
return sysfs_emit(buf, "%s\n", state ? "enabled" : "disabled");
10921092
}
10931093

10941094
static ssize_t charger_externally_control_show(struct device *dev,
@@ -1097,7 +1097,7 @@ static ssize_t charger_externally_control_show(struct device *dev,
10971097
struct charger_regulator *charger = container_of(attr,
10981098
struct charger_regulator, attr_externally_control);
10991099

1100-
return sprintf(buf, "%d\n", charger->externally_control);
1100+
return sysfs_emit(buf, "%d\n", charger->externally_control);
11011101
}
11021102

11031103
static ssize_t charger_externally_control_store(struct device *dev,

‎drivers/power/supply/ds2780_battery.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ static ssize_t ds2780_get_pmod_enabled(struct device *dev,
454454
if (ret < 0)
455455
return ret;
456456

457-
return sprintf(buf, "%d\n",
457+
return sysfs_emit(buf, "%d\n",
458458
!!(control_reg & DS2780_CONTROL_REG_PMOD));
459459
}
460460

@@ -507,7 +507,7 @@ static ssize_t ds2780_get_sense_resistor_value(struct device *dev,
507507
if (ret < 0)
508508
return ret;
509509

510-
ret = sprintf(buf, "%d\n", sense_resistor);
510+
ret = sysfs_emit(buf, "%d\n", sense_resistor);
511511
return ret;
512512
}
513513

@@ -545,7 +545,7 @@ static ssize_t ds2780_get_rsgain_setting(struct device *dev,
545545
if (ret < 0)
546546
return ret;
547547

548-
return sprintf(buf, "%d\n", rsgain);
548+
return sysfs_emit(buf, "%d\n", rsgain);
549549
}
550550

551551
static ssize_t ds2780_set_rsgain_setting(struct device *dev,
@@ -588,7 +588,7 @@ static ssize_t ds2780_get_pio_pin(struct device *dev,
588588
if (ret < 0)
589589
return ret;
590590

591-
ret = sprintf(buf, "%d\n", sfr & DS2780_SFR_REG_PIOSC);
591+
ret = sysfs_emit(buf, "%d\n", sfr & DS2780_SFR_REG_PIOSC);
592592
return ret;
593593
}
594594

‎drivers/power/supply/ds2781_battery.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ static ssize_t ds2781_get_pmod_enabled(struct device *dev,
456456
if (ret < 0)
457457
return ret;
458458

459-
return sprintf(buf, "%d\n",
459+
return sysfs_emit(buf, "%d\n",
460460
!!(control_reg & DS2781_CONTROL_PMOD));
461461
}
462462

@@ -509,7 +509,7 @@ static ssize_t ds2781_get_sense_resistor_value(struct device *dev,
509509
if (ret < 0)
510510
return ret;
511511

512-
ret = sprintf(buf, "%d\n", sense_resistor);
512+
ret = sysfs_emit(buf, "%d\n", sense_resistor);
513513
return ret;
514514
}
515515

@@ -547,7 +547,7 @@ static ssize_t ds2781_get_rsgain_setting(struct device *dev,
547547
if (ret < 0)
548548
return ret;
549549

550-
return sprintf(buf, "%d\n", rsgain);
550+
return sysfs_emit(buf, "%d\n", rsgain);
551551
}
552552

553553
static ssize_t ds2781_set_rsgain_setting(struct device *dev,
@@ -590,7 +590,7 @@ static ssize_t ds2781_get_pio_pin(struct device *dev,
590590
if (ret < 0)
591591
return ret;
592592

593-
ret = sprintf(buf, "%d\n", sfr & DS2781_SFR_PIOSC);
593+
ret = sysfs_emit(buf, "%d\n", sfr & DS2781_SFR_PIOSC);
594594
return ret;
595595
}
596596

‎drivers/power/supply/ltc4162-l-charger.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ static ssize_t charge_status_show(struct device *dev,
525525
}
526526
}
527527

528-
return sprintf(buf, "%s\n", result);
528+
return sysfs_emit(buf, "%s\n", result);
529529
}
530530
static DEVICE_ATTR_RO(charge_status);
531531

@@ -541,7 +541,7 @@ static ssize_t vbat_show(struct device *dev,
541541
if (ret)
542542
return ret;
543543

544-
return sprintf(buf, "%d\n", val.intval);
544+
return sysfs_emit(buf, "%d\n", val.intval);
545545
}
546546
static DEVICE_ATTR_RO(vbat);
547547

@@ -557,7 +557,7 @@ static ssize_t vbat_avg_show(struct device *dev,
557557
if (ret)
558558
return ret;
559559

560-
return sprintf(buf, "%d\n", val.intval);
560+
return sysfs_emit(buf, "%d\n", val.intval);
561561
}
562562
static DEVICE_ATTR_RO(vbat_avg);
563563

@@ -573,7 +573,7 @@ static ssize_t ibat_show(struct device *dev,
573573
if (ret)
574574
return ret;
575575

576-
return sprintf(buf, "%d\n", val.intval);
576+
return sysfs_emit(buf, "%d\n", val.intval);
577577
}
578578
static DEVICE_ATTR_RO(ibat);
579579

@@ -589,7 +589,7 @@ static ssize_t force_telemetry_show(struct device *dev,
589589
if (ret)
590590
return ret;
591591

592-
return sprintf(buf, "%u\n", regval & BIT(2) ? 1 : 0);
592+
return sysfs_emit(buf, "%u\n", regval & BIT(2) ? 1 : 0);
593593
}
594594

595595
static ssize_t force_telemetry_store(struct device *dev,
@@ -628,7 +628,7 @@ static ssize_t arm_ship_mode_show(struct device *dev,
628628
if (ret)
629629
return ret;
630630

631-
return sprintf(buf, "%u\n",
631+
return sysfs_emit(buf, "%u\n",
632632
regval == LTC4162L_ARM_SHIP_MODE_MAGIC ? 1 : 0);
633633
}
634634

‎drivers/power/supply/mp2629_charger.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ static ssize_t batt_impedance_compensation_show(struct device *dev,
519519
return ret;
520520

521521
rval = (rval >> 4) * 10;
522-
return sprintf(buf, "%d mohm\n", rval);
522+
return sysfs_emit(buf, "%d mohm\n", rval);
523523
}
524524

525525
static ssize_t batt_impedance_compensation_store(struct device *dev,

‎drivers/power/supply/olpc_battery.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ static ssize_t olpc_bat_error_read(struct device *dev,
568568
if (ret < 0)
569569
return ret;
570570

571-
return sprintf(buf, "%d\n", ec_byte);
571+
return sysfs_emit(buf, "%d\n", ec_byte);
572572
}
573573

574574
static struct device_attribute olpc_bat_error = {

‎drivers/power/supply/pcf50633-charger.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ show_chgmode(struct device *dev, struct device_attribute *attr, char *buf)
153153
u8 mbcs2 = pcf50633_reg_read(mbc->pcf, PCF50633_REG_MBCS2);
154154
u8 chgmod = (mbcs2 & PCF50633_MBCS2_MBC_MASK);
155155

156-
return sprintf(buf, "%d\n", chgmod);
156+
return sysfs_emit(buf, "%d\n", chgmod);
157157
}
158158
static DEVICE_ATTR(chgmode, S_IRUGO, show_chgmode, NULL);
159159

@@ -174,7 +174,7 @@ show_usblim(struct device *dev, struct device_attribute *attr, char *buf)
174174
else
175175
ma = 0;
176176

177-
return sprintf(buf, "%u\n", ma);
177+
return sysfs_emit(buf, "%u\n", ma);
178178
}
179179

180180
static ssize_t set_usblim(struct device *dev,
@@ -207,7 +207,7 @@ show_chglim(struct device *dev, struct device_attribute *attr, char *buf)
207207

208208
ma = (mbc->pcf->pdata->charger_reference_current_ma * mbcc5) >> 8;
209209

210-
return sprintf(buf, "%u\n", ma);
210+
return sysfs_emit(buf, "%u\n", ma);
211211
}
212212

213213
static ssize_t set_chglim(struct device *dev,

‎drivers/power/supply/power_supply_sysfs.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -249,11 +249,11 @@ static ssize_t power_supply_show_usb_type(struct device *dev,
249249
usb_type = desc->usb_types[i];
250250

251251
if (value->intval == usb_type) {
252-
count += sprintf(buf + count, "[%s] ",
252+
count += sysfs_emit_at(buf, count, "[%s] ",
253253
POWER_SUPPLY_USB_TYPE_TEXT[usb_type]);
254254
match = true;
255255
} else {
256-
count += sprintf(buf + count, "%s ",
256+
count += sysfs_emit_at(buf, count, "%s ",
257257
POWER_SUPPLY_USB_TYPE_TEXT[usb_type]);
258258
}
259259
}
@@ -297,7 +297,7 @@ static ssize_t power_supply_show_property(struct device *dev,
297297

298298
if (ps_attr->text_values_len > 0 &&
299299
value.intval < ps_attr->text_values_len && value.intval >= 0) {
300-
return sprintf(buf, "%s\n", ps_attr->text_values[value.intval]);
300+
return sysfs_emit(buf, "%s\n", ps_attr->text_values[value.intval]);
301301
}
302302

303303
switch (psp) {
@@ -306,10 +306,10 @@ static ssize_t power_supply_show_property(struct device *dev,
306306
&value, buf);
307307
break;
308308
case POWER_SUPPLY_PROP_MODEL_NAME ... POWER_SUPPLY_PROP_SERIAL_NUMBER:
309-
ret = sprintf(buf, "%s\n", value.strval);
309+
ret = sysfs_emit(buf, "%s\n", value.strval);
310310
break;
311311
default:
312-
ret = sprintf(buf, "%d\n", value.intval);
312+
ret = sysfs_emit(buf, "%d\n", value.intval);
313313
}
314314

315315
return ret;

0 commit comments

Comments
 (0)