Commit c3ed761c authored by David Lechner's avatar David Lechner Committed by Greg Kroah-Hartman
Browse files

counter/counter-sysfs: use sysfs_emit everywhere 



In the counter subsystem, we are already using sysfs_emit(), but there
were a few places where we were still using sprintf() in *_show()
functions. For consistency and added protections, use sysfs_emit()
everywhere.

Suggested-by: default avatarGreg KH <gregkh@linuxfoundation.org>
Acked-by: default avatarWilliam Breathitt Gray <vilhelm.gray@gmail.com>
Signed-off-by: default avatarDavid Lechner <david@lechnology.com>
Link: https://lore.kernel.org/r/20211017190106.3472645-1-david@lechnology.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 15c9a359

drivers/counter/counter-sysfs.c

+4 −4
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static ssize_t counter_comp_u8_show(struct device *dev, 
		/* data should already be boolean but ensure just to be safe */

		data = !!data;



	return sprintf(buf, "%u\n", (unsigned int)data);

	return sysfs_emit(buf, "%u\n", (unsigned int)data);

}



static ssize_t counter_comp_u8_store(struct device *dev,
@@ -196,7 +196,7 @@ static ssize_t counter_comp_u32_show(struct device *dev, 
	case COUNTER_COMP_COUNT_MODE:

		return sysfs_emit(buf, "%s\n", counter_count_mode_str[data]);

	default:

		return sprintf(buf, "%u\n", (unsigned int)data);

		return sysfs_emit(buf, "%u\n", (unsigned int)data);

	}

}
@@ -300,7 +300,7 @@ static ssize_t counter_comp_u64_show(struct device *dev, 
	if (err < 0)

		return err;



	return sprintf(buf, "%llu\n", (unsigned long long)data);

	return sysfs_emit(buf, "%llu\n", (unsigned long long)data);

}



static ssize_t counter_comp_u64_store(struct device *dev,
@@ -539,7 +539,7 @@ static ssize_t counter_comp_id_show(struct device *dev, 
{

	const size_t id = (size_t)to_counter_attribute(attr)->comp.priv;



	return sprintf(buf, "%zu\n", id);

	return sysfs_emit(buf, "%zu\n", id);

}



static int counter_comp_id_attr_create(struct device *const dev,