Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf4228f0 authored by Jingoo Han's avatar Jingoo Han Committed by Linus Torvalds
Browse files

drivers/w1/w1.c: replace strict_strtol() with kstrtol() 



The usage of strict_strtol() is not preferred, because strict_strtol() is
obsolete.  Thus, kstrtol() should be used.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Cc: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0ab30494

drivers/w1/w1.c

+8 −4
Original line number Diff line number Diff line
@@ -234,9 +234,11 @@ static ssize_t w1_master_attribute_store_search(struct device * dev, 
{

	long tmp;

	struct w1_master *md = dev_to_w1_master(dev);

	int ret;



	if (strict_strtol(buf, 0, &tmp) == -EINVAL)

		return -EINVAL;

	ret = kstrtol(buf, 0, &tmp);

	if (ret)

		return ret;



	mutex_lock(&md->mutex);

	md->search_count = tmp;
@@ -266,9 +268,11 @@ static ssize_t w1_master_attribute_store_pullup(struct device *dev, 
{

	long tmp;

	struct w1_master *md = dev_to_w1_master(dev);

	int ret;



	if (strict_strtol(buf, 0, &tmp) == -EINVAL)

		return -EINVAL;

	ret = kstrtol(buf, 0, &tmp);

	if (ret)

		return ret;



	mutex_lock(&md->mutex);

	md->enable_pullup = tmp;