Commit a441f3b9 authored by ye xingchen's avatar ye xingchen Committed by Sebastian Reichel
Browse files

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: default avatarye 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: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent 35aa0628

drivers/power/supply/ab8500_fg.c

+2 −2
Original line number Diff line number Diff line
@@ -2453,7 +2453,7 @@ struct ab8500_fg_sysfs_entry { 


static ssize_t charge_full_show(struct ab8500_fg *di, char *buf)

{

	return sprintf(buf, "%d\n", di->bat_cap.max_mah);

	return sysfs_emit(buf, "%d\n", di->bat_cap.max_mah);

}



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, 


static ssize_t charge_now_show(struct ab8500_fg *di, char *buf)

{

	return sprintf(buf, "%d\n", di->bat_cap.prev_mah);

	return sysfs_emit(buf, "%d\n", di->bat_cap.prev_mah);

}



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

drivers/power/supply/bq2415x_charger.c

+21 −21
Original line number Diff line number Diff line
@@ -1059,7 +1059,7 @@ static ssize_t bq2415x_sysfs_show_status(struct device *dev, 
	ret = bq2415x_exec_command(bq, command);

	if (ret < 0)

		return ret;

	return sprintf(buf, "%d\n", ret);

	return sysfs_emit(buf, "%d\n", ret);

}



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



	if (bq->timer_error)

		return sprintf(buf, "%s\n", bq->timer_error);

		return sysfs_emit(buf, "%s\n", bq->timer_error);



	if (bq->autotimer)

		return sprintf(buf, "auto\n");

	return sprintf(buf, "off\n");

		return sysfs_emit(buf, "auto\n");

	return sysfs_emit(buf, "off\n");

}



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



	if (bq->automode > 0)

		ret += sprintf(buf+ret, "auto (");

		ret += sysfs_emit_at(buf, ret, "auto (");



	switch (bq->mode) {

	case BQ2415X_MODE_OFF:

		ret += sprintf(buf+ret, "off");

		ret += sysfs_emit_at(buf, ret, "off");

		break;

	case BQ2415X_MODE_NONE:

		ret += sprintf(buf+ret, "none");

		ret += sysfs_emit_at(buf, ret, "none");

		break;

	case BQ2415X_MODE_HOST_CHARGER:

		ret += sprintf(buf+ret, "host");

		ret += sysfs_emit_at(buf, ret, "host");

		break;

	case BQ2415X_MODE_DEDICATED_CHARGER:

		ret += sprintf(buf+ret, "dedicated");

		ret += sysfs_emit_at(buf, ret, "dedicated");

		break;

	case BQ2415X_MODE_BOOST:

		ret += sprintf(buf+ret, "boost");

		ret += sysfs_emit_at(buf, ret, "boost");

		break;

	}



	if (bq->automode > 0)

		ret += sprintf(buf+ret, ")");

		ret += sysfs_emit_at(buf, ret, ")");



	ret += sprintf(buf+ret, "\n");

	ret += sysfs_emit_at(buf, ret, "\n");

	return ret;

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


	switch (bq->reported_mode) {

	case BQ2415X_MODE_OFF:

		return sprintf(buf, "off\n");

		return sysfs_emit(buf, "off\n");

	case BQ2415X_MODE_NONE:

		return sprintf(buf, "none\n");

		return sysfs_emit(buf, "none\n");

	case BQ2415X_MODE_HOST_CHARGER:

		return sprintf(buf, "host\n");

		return sysfs_emit(buf, "host\n");

	case BQ2415X_MODE_DEDICATED_CHARGER:

		return sprintf(buf, "dedicated\n");

		return sysfs_emit(buf, "dedicated\n");

	case BQ2415X_MODE_BOOST:

		return sprintf(buf, "boost\n");

		return sysfs_emit(buf, "boost\n");

	}



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



	if (ret < 0)

		return sprintf(buf, "%#.2x=error %d\n", reg, ret);

	return sprintf(buf, "%#.2x=%#.2x\n", reg, ret);

		return sysfs_emit(buf, "%#.2x=error %d\n", reg, ret);

	return sysfs_emit(buf, "%#.2x=%#.2x\n", reg, ret);

}



/* 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, 


	if (ret < 0)

		return ret;

	return sprintf(buf, "%d\n", ret);

	return sysfs_emit(buf, "%d\n", ret);

}



/* set *_enable entries */
@@ -1401,7 +1401,7 @@ static ssize_t bq2415x_sysfs_show_enable(struct device *dev, 
	ret = bq2415x_exec_command(bq, command);

	if (ret < 0)

		return ret;

	return sprintf(buf, "%d\n", ret);

	return sysfs_emit(buf, "%d\n", ret);

}



static DEVICE_ATTR(current_limit, S_IWUSR | S_IRUGO,

drivers/power/supply/charger-manager.c

+3 −3
Original line number Diff line number Diff line
@@ -1075,7 +1075,7 @@ static ssize_t charger_name_show(struct device *dev, 
	struct charger_regulator *charger

		= container_of(attr, struct charger_regulator, attr_name);



	return sprintf(buf, "%s\n", charger->regulator_name);

	return sysfs_emit(buf, "%s\n", charger->regulator_name);

}



static ssize_t charger_state_show(struct device *dev,
@@ -1088,7 +1088,7 @@ static ssize_t charger_state_show(struct device *dev, 
	if (!charger->externally_control)

		state = regulator_is_enabled(charger->consumer);



	return sprintf(buf, "%s\n", state ? "enabled" : "disabled");

	return sysfs_emit(buf, "%s\n", state ? "enabled" : "disabled");

}



static ssize_t charger_externally_control_show(struct device *dev,
@@ -1097,7 +1097,7 @@ static ssize_t charger_externally_control_show(struct device *dev, 
	struct charger_regulator *charger = container_of(attr,

			struct charger_regulator, attr_externally_control);



	return sprintf(buf, "%d\n", charger->externally_control);

	return sysfs_emit(buf, "%d\n", charger->externally_control);

}



static ssize_t charger_externally_control_store(struct device *dev,

drivers/power/supply/ds2780_battery.c

+4 −4
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ static ssize_t ds2780_get_pmod_enabled(struct device *dev, 
	if (ret < 0)

		return ret;



	return sprintf(buf, "%d\n",

	return sysfs_emit(buf, "%d\n",

		 !!(control_reg & DS2780_CONTROL_REG_PMOD));

}
@@ -507,7 +507,7 @@ static ssize_t ds2780_get_sense_resistor_value(struct device *dev, 
	if (ret < 0)

		return ret;



	ret = sprintf(buf, "%d\n", sense_resistor);

	ret = sysfs_emit(buf, "%d\n", sense_resistor);

	return ret;

}
@@ -545,7 +545,7 @@ static ssize_t ds2780_get_rsgain_setting(struct device *dev, 
	if (ret < 0)

		return ret;



	return sprintf(buf, "%d\n", rsgain);

	return sysfs_emit(buf, "%d\n", rsgain);

}



static ssize_t ds2780_set_rsgain_setting(struct device *dev,
@@ -588,7 +588,7 @@ static ssize_t ds2780_get_pio_pin(struct device *dev, 
	if (ret < 0)

		return ret;



	ret = sprintf(buf, "%d\n", sfr & DS2780_SFR_REG_PIOSC);

	ret = sysfs_emit(buf, "%d\n", sfr & DS2780_SFR_REG_PIOSC);

	return ret;

}

drivers/power/supply/ds2781_battery.c

+4 −4
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ static ssize_t ds2781_get_pmod_enabled(struct device *dev, 
	if (ret < 0)

		return ret;



	return sprintf(buf, "%d\n",

	return sysfs_emit(buf, "%d\n",

		 !!(control_reg & DS2781_CONTROL_PMOD));

}
@@ -509,7 +509,7 @@ static ssize_t ds2781_get_sense_resistor_value(struct device *dev, 
	if (ret < 0)

		return ret;



	ret = sprintf(buf, "%d\n", sense_resistor);

	ret = sysfs_emit(buf, "%d\n", sense_resistor);

	return ret;

}
@@ -547,7 +547,7 @@ static ssize_t ds2781_get_rsgain_setting(struct device *dev, 
	if (ret < 0)

		return ret;



	return sprintf(buf, "%d\n", rsgain);

	return sysfs_emit(buf, "%d\n", rsgain);

}



static ssize_t ds2781_set_rsgain_setting(struct device *dev,
@@ -590,7 +590,7 @@ static ssize_t ds2781_get_pio_pin(struct device *dev, 
	if (ret < 0)

		return ret;



	ret = sprintf(buf, "%d\n", sfr & DS2781_SFR_PIOSC);

	ret = sysfs_emit(buf, "%d\n", sfr & DS2781_SFR_PIOSC);

	return ret;

}