Commit 1f4d4af4 authored by Guenter Roeck's avatar Guenter Roeck
Browse files

hwmon: replace snprintf in show functions with sysfs_emit 



coccicheck complains about the use of snprintf() in sysfs
show functions.

drivers/hwmon/ina3221.c:701:8-16: WARNING: use scnprintf or sprintf

This results in a large number of patch submissions. Fix it all in
one go using the following coccinelle rules. Use sysfs_emit instead
of scnprintf or sprintf since that makes more sense.

@depends on patch@
identifier show, dev, attr, buf;
@@

ssize_t show(struct device *dev, struct device_attribute *attr, char *buf)
{
	<...
  return
-		snprintf(buf, \( PAGE_SIZE \| PAGE_SIZE - 1 \),
+		sysfs_emit(buf,
		...);
	...>
}

@depends on patch@
identifier show, dev, attr, buf, rc;
@@

ssize_t show(struct device *dev, struct device_attribute *attr, char *buf)
{
	<...
  rc =
-		snprintf(buf, \( PAGE_SIZE \| PAGE_SIZE - 1 \),
+		sysfs_emit(buf,
		...);
	...>
}

While at it, remove unnecessary braces and as well as unnecessary
else after return statements to address checkpatch warnings in the
resulting patch.

Cc: Zihao Tang <tangzihao1@hisilicon.com>
Cc: Jay Fang <f.fangjian@huawei.com>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent f807e8be

drivers/hwmon/applesmc.c

+17 −17
Original line number Diff line number Diff line
@@ -741,7 +741,7 @@ static void applesmc_idev_poll(struct input_dev *idev) 
static ssize_t applesmc_name_show(struct device *dev,

				   struct device_attribute *attr, char *buf)

{

	return snprintf(buf, PAGE_SIZE, "applesmc\n");

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

}



static ssize_t applesmc_position_show(struct device *dev,
@@ -763,8 +763,8 @@ static ssize_t applesmc_position_show(struct device *dev, 
out:

	if (ret)

		return ret;

	else

		return snprintf(buf, PAGE_SIZE, "(%d,%d,%d)\n", x, y, z);



	return sysfs_emit(buf, "(%d,%d,%d)\n", x, y, z);

}



static ssize_t applesmc_light_show(struct device *dev,
@@ -804,8 +804,8 @@ static ssize_t applesmc_light_show(struct device *dev, 
out:

	if (ret)

		return ret;

	else

		return snprintf(sysfsbuf, PAGE_SIZE, "(%d,%d)\n", left, right);



	return sysfs_emit(sysfsbuf, "(%d,%d)\n", left, right);

}



/* Displays sensor key as label */
@@ -814,7 +814,7 @@ static ssize_t applesmc_show_sensor_label(struct device *dev, 
{

	const char *key = smcreg.index[to_index(devattr)];



	return snprintf(sysfsbuf, PAGE_SIZE, "%s\n", key);

	return sysfs_emit(sysfsbuf, "%s\n", key);

}



/* Displays degree Celsius * 1000 */
@@ -832,7 +832,7 @@ static ssize_t applesmc_show_temperature(struct device *dev, 


	temp = 250 * (value >> 6);



	return snprintf(sysfsbuf, PAGE_SIZE, "%d\n", temp);

	return sysfs_emit(sysfsbuf, "%d\n", temp);

}



static ssize_t applesmc_show_fan_speed(struct device *dev,
@@ -851,7 +851,7 @@ static ssize_t applesmc_show_fan_speed(struct device *dev, 
		return ret;



	speed = ((buffer[0] << 8 | buffer[1]) >> 2);

	return snprintf(sysfsbuf, PAGE_SIZE, "%u\n", speed);

	return sysfs_emit(sysfsbuf, "%u\n", speed);

}



static ssize_t applesmc_store_fan_speed(struct device *dev,
@@ -891,7 +891,7 @@ static ssize_t applesmc_show_fan_manual(struct device *dev, 
		return ret;



	manual = ((buffer[0] << 8 | buffer[1]) >> to_index(attr)) & 0x01;

	return snprintf(sysfsbuf, PAGE_SIZE, "%d\n", manual);

	return sysfs_emit(sysfsbuf, "%d\n", manual);

}



static ssize_t applesmc_store_fan_manual(struct device *dev,
@@ -943,14 +943,14 @@ static ssize_t applesmc_show_fan_position(struct device *dev, 


	if (ret)

		return ret;

	else

		return snprintf(sysfsbuf, PAGE_SIZE, "%s\n", buffer+4);



	return sysfs_emit(sysfsbuf, "%s\n", buffer + 4);

}



static ssize_t applesmc_calibrate_show(struct device *dev,

				struct device_attribute *attr, char *sysfsbuf)

{

	return snprintf(sysfsbuf, PAGE_SIZE, "(%d,%d)\n", rest_x, rest_y);

	return sysfs_emit(sysfsbuf, "(%d,%d)\n", rest_x, rest_y);

}



static ssize_t applesmc_calibrate_store(struct device *dev,
@@ -992,7 +992,7 @@ static ssize_t applesmc_key_count_show(struct device *dev, 


	count = ((u32)buffer[0]<<24) + ((u32)buffer[1]<<16) +

						((u32)buffer[2]<<8) + buffer[3];

	return snprintf(sysfsbuf, PAGE_SIZE, "%d\n", count);

	return sysfs_emit(sysfsbuf, "%d\n", count);

}



static ssize_t applesmc_key_at_index_read_show(struct device *dev,
@@ -1020,7 +1020,7 @@ static ssize_t applesmc_key_at_index_data_length_show(struct device *dev, 
	if (IS_ERR(entry))

		return PTR_ERR(entry);



	return snprintf(sysfsbuf, PAGE_SIZE, "%d\n", entry->len);

	return sysfs_emit(sysfsbuf, "%d\n", entry->len);

}



static ssize_t applesmc_key_at_index_type_show(struct device *dev,
@@ -1032,7 +1032,7 @@ static ssize_t applesmc_key_at_index_type_show(struct device *dev, 
	if (IS_ERR(entry))

		return PTR_ERR(entry);



	return snprintf(sysfsbuf, PAGE_SIZE, "%s\n", entry->type);

	return sysfs_emit(sysfsbuf, "%s\n", entry->type);

}



static ssize_t applesmc_key_at_index_name_show(struct device *dev,
@@ -1044,13 +1044,13 @@ static ssize_t applesmc_key_at_index_name_show(struct device *dev, 
	if (IS_ERR(entry))

		return PTR_ERR(entry);



	return snprintf(sysfsbuf, PAGE_SIZE, "%s\n", entry->key);

	return sysfs_emit(sysfsbuf, "%s\n", entry->key);

}



static ssize_t applesmc_key_at_index_show(struct device *dev,

				struct device_attribute *attr, char *sysfsbuf)

{

	return snprintf(sysfsbuf, PAGE_SIZE, "%d\n", key_at_index);

	return sysfs_emit(sysfsbuf, "%d\n", key_at_index);

}



static ssize_t applesmc_key_at_index_store(struct device *dev,

drivers/hwmon/ina209.c

+3 −3
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ static ssize_t ina209_interval_show(struct device *dev, 
{

	struct ina209_data *data = dev_get_drvdata(dev);



	return snprintf(buf, PAGE_SIZE, "%d\n", data->update_interval);

	return sysfs_emit(buf, "%d\n", data->update_interval);

}



/*
@@ -343,7 +343,7 @@ static ssize_t ina209_value_show(struct device *dev, 
		return PTR_ERR(data);



	val = ina209_from_reg(attr->index, data->regs[attr->index]);

	return snprintf(buf, PAGE_SIZE, "%ld\n", val);

	return sysfs_emit(buf, "%ld\n", val);

}



static ssize_t ina209_alarm_show(struct device *dev,
@@ -363,7 +363,7 @@ static ssize_t ina209_alarm_show(struct device *dev, 
	 * All alarms are in the INA209_STATUS register. To avoid a long

	 * switch statement, the mask is passed in attr->index

	 */

	return snprintf(buf, PAGE_SIZE, "%u\n", !!(status & mask));

	return sysfs_emit(buf, "%u\n", !!(status & mask));

}



/* Shunt voltage, history, limits, alarms */

drivers/hwmon/ina2xx.c

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ static ssize_t ina226_alert_show(struct device *dev, 
		val = ina226_reg_to_alert(data, attr->index, regval);

	}



	ret = snprintf(buf, PAGE_SIZE, "%d\n", val);

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

abort:

	mutex_unlock(&data->config_lock);

	return ret;

drivers/hwmon/ina3221.c

+1 −1
Original line number Diff line number Diff line
@@ -698,7 +698,7 @@ static ssize_t ina3221_shunt_show(struct device *dev, 
	unsigned int channel = sd_attr->index;

	struct ina3221_input *input = &ina->inputs[channel];



	return snprintf(buf, PAGE_SIZE, "%d\n", input->shunt_resistor);

	return sysfs_emit(buf, "%d\n", input->shunt_resistor);

}



static ssize_t ina3221_shunt_store(struct device *dev,

drivers/hwmon/lineage-pem.c

+4 −4
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ static ssize_t pem_bool_show(struct device *dev, struct device_attribute *da, 
		return PTR_ERR(data);



	status = data->data_string[attr->nr] & attr->index;

	return snprintf(buf, PAGE_SIZE, "%d\n", !!status);

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

}



static ssize_t pem_data_show(struct device *dev, struct device_attribute *da,
@@ -296,7 +296,7 @@ static ssize_t pem_data_show(struct device *dev, struct device_attribute *da, 
	value = pem_get_data(data->data_string, sizeof(data->data_string),

			     attr->index);



	return snprintf(buf, PAGE_SIZE, "%ld\n", value);

	return sysfs_emit(buf, "%ld\n", value);

}



static ssize_t pem_input_show(struct device *dev, struct device_attribute *da,
@@ -312,7 +312,7 @@ static ssize_t pem_input_show(struct device *dev, struct device_attribute *da, 
	value = pem_get_input(data->input_string, sizeof(data->input_string),

			      attr->index);



	return snprintf(buf, PAGE_SIZE, "%ld\n", value);

	return sysfs_emit(buf, "%ld\n", value);

}



static ssize_t pem_fan_show(struct device *dev, struct device_attribute *da,
@@ -328,7 +328,7 @@ static ssize_t pem_fan_show(struct device *dev, struct device_attribute *da, 
	value = pem_get_fan(data->fan_speed, sizeof(data->fan_speed),

			    attr->index);



	return snprintf(buf, PAGE_SIZE, "%ld\n", value);

	return sysfs_emit(buf, "%ld\n", value);

}



/* Voltages */