Commit f88184bf authored by Kaitao cheng's avatar Kaitao cheng Committed by Greg Kroah-Hartman
Browse files

driver core: Replace simple_strto{l,ul} by kstrtou{l,ul}



The simple_strto{l,ul} are deprecated, use kstrtou{l,ul} instead.

Signed-off-by: default avatarKaitao cheng <pilgrimtao@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 03c0a920
Loading
Loading
Loading
Loading
+14 −7
Original line number Diff line number Diff line
@@ -794,10 +794,12 @@ ssize_t device_store_ulong(struct device *dev,
			   const char *buf, size_t size)
{
	struct dev_ext_attribute *ea = to_ext_attr(attr);
	char *end;
	unsigned long new = simple_strtoul(buf, &end, 0);
	if (end == buf)
		return -EINVAL;
	int ret;
	unsigned long new;

	ret = kstrtoul(buf, 0, &new);
	if (ret)
		return ret;
	*(unsigned long *)(ea->var) = new;
	/* Always return full write size even if we didn't consume all */
	return size;
@@ -818,9 +820,14 @@ ssize_t device_store_int(struct device *dev,
			 const char *buf, size_t size)
{
	struct dev_ext_attribute *ea = to_ext_attr(attr);
	char *end;
	long new = simple_strtol(buf, &end, 0);
	if (end == buf || new > INT_MAX || new < INT_MIN)
	int ret;
	long new;

	ret = kstrtol(buf, 0, &new);
	if (ret)
		return ret;

	if (new > INT_MAX || new < INT_MIN)
		return -EINVAL;
	*(int *)(ea->var) = new;
	/* Always return full write size even if we didn't consume all */