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

Commit 76496e7a authored by JJ Ding's avatar JJ Ding Committed by Dmitry Torokhov
Browse files

Input: convert obsolete strict_strtox to kstrtox 



With commit 67d0a075 we mark strict_strtox
as obsolete. Convert all remaining such uses in drivers/input/.

Also change long to appropriate types, and return error conditions
from kstrtox separately, as Dmitry sugguests.

Signed-off-by: default avatarJJ Ding <dgdunix@gmail.com>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 7cf801cf

drivers/input/input-polldev.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -83,10 +83,12 @@ static ssize_t input_polldev_set_poll(struct device *dev, 
{

{

	struct input_polled_dev *polldev = dev_get_drvdata(dev);

	struct input_polled_dev *polldev = dev_get_drvdata(dev);

	struct input_dev *input = polldev->input;

	struct input_dev *input = polldev->input;

	unsigned long interval;

	unsigned int interval;

	int err;





	if (strict_strtoul(buf, 0, &interval))

	err = kstrtouint(buf, 0, &interval);

		return -EINVAL;

	if (err)

		return err;





	if (interval < polldev->poll_interval_min)

	if (interval < polldev->poll_interval_min)

		return -EINVAL;

		return -EINVAL;

drivers/input/keyboard/atkbd.c

+30 −10
Original line number Original line Diff line number Diff line
@@ -1305,7 +1305,7 @@ static ssize_t atkbd_show_extra(struct atkbd *atkbd, char *buf) 
static ssize_t atkbd_set_extra(struct atkbd *atkbd, const char *buf, size_t count)

static ssize_t atkbd_set_extra(struct atkbd *atkbd, const char *buf, size_t count)

{

{

	struct input_dev *old_dev, *new_dev;

	struct input_dev *old_dev, *new_dev;

	unsigned long value;

	unsigned int value;

	int err;

	int err;

	bool old_extra;

	bool old_extra;

	unsigned char old_set;

	unsigned char old_set;
@@ -1313,7 +1313,11 @@ static ssize_t atkbd_set_extra(struct atkbd *atkbd, const char *buf, size_t coun 
	if (!atkbd->write)

	if (!atkbd->write)

		return -EIO;

		return -EIO;





	if (strict_strtoul(buf, 10, &value) || value > 1)

	err = kstrtouint(buf, 10, &value);

	if (err)

		return err;



	if (value > 1)

		return -EINVAL;

		return -EINVAL;





	if (atkbd->extra != value) {

	if (atkbd->extra != value) {
@@ -1389,11 +1393,15 @@ static ssize_t atkbd_show_scroll(struct atkbd *atkbd, char *buf) 
static ssize_t atkbd_set_scroll(struct atkbd *atkbd, const char *buf, size_t count)

static ssize_t atkbd_set_scroll(struct atkbd *atkbd, const char *buf, size_t count)

{

{

	struct input_dev *old_dev, *new_dev;

	struct input_dev *old_dev, *new_dev;

	unsigned long value;

	unsigned int value;

	int err;

	int err;

	bool old_scroll;

	bool old_scroll;





	if (strict_strtoul(buf, 10, &value) || value > 1)

	err = kstrtouint(buf, 10, &value);

	if (err)

		return err;



	if (value > 1)

		return -EINVAL;

		return -EINVAL;





	if (atkbd->scroll != value) {

	if (atkbd->scroll != value) {
@@ -1433,7 +1441,7 @@ static ssize_t atkbd_show_set(struct atkbd *atkbd, char *buf) 
static ssize_t atkbd_set_set(struct atkbd *atkbd, const char *buf, size_t count)

static ssize_t atkbd_set_set(struct atkbd *atkbd, const char *buf, size_t count)

{

{

	struct input_dev *old_dev, *new_dev;

	struct input_dev *old_dev, *new_dev;

	unsigned long value;

	unsigned int value;

	int err;

	int err;

	unsigned char old_set;

	unsigned char old_set;

	bool old_extra;

	bool old_extra;
@@ -1441,7 +1449,11 @@ static ssize_t atkbd_set_set(struct atkbd *atkbd, const char *buf, size_t count) 
	if (!atkbd->write)

	if (!atkbd->write)

		return -EIO;

		return -EIO;





	if (strict_strtoul(buf, 10, &value) || (value != 2 && value != 3))

	err = kstrtouint(buf, 10, &value);

	if (err)

		return err;



	if (value != 2 && value != 3)

		return -EINVAL;

		return -EINVAL;





	if (atkbd->set != value) {

	if (atkbd->set != value) {
@@ -1484,14 +1496,18 @@ static ssize_t atkbd_show_softrepeat(struct atkbd *atkbd, char *buf) 
static ssize_t atkbd_set_softrepeat(struct atkbd *atkbd, const char *buf, size_t count)

static ssize_t atkbd_set_softrepeat(struct atkbd *atkbd, const char *buf, size_t count)

{

{

	struct input_dev *old_dev, *new_dev;

	struct input_dev *old_dev, *new_dev;

	unsigned long value;

	unsigned int value;

	int err;

	int err;

	bool old_softrepeat, old_softraw;

	bool old_softrepeat, old_softraw;





	if (!atkbd->write)

	if (!atkbd->write)

		return -EIO;

		return -EIO;





	if (strict_strtoul(buf, 10, &value) || value > 1)

	err = kstrtouint(buf, 10, &value);

	if (err)

		return err;



	if (value > 1)

		return -EINVAL;

		return -EINVAL;





	if (atkbd->softrepeat != value) {

	if (atkbd->softrepeat != value) {
@@ -1534,11 +1550,15 @@ static ssize_t atkbd_show_softraw(struct atkbd *atkbd, char *buf) 
static ssize_t atkbd_set_softraw(struct atkbd *atkbd, const char *buf, size_t count)

static ssize_t atkbd_set_softraw(struct atkbd *atkbd, const char *buf, size_t count)

{

{

	struct input_dev *old_dev, *new_dev;

	struct input_dev *old_dev, *new_dev;

	unsigned long value;

	unsigned int value;

	int err;

	int err;

	bool old_softraw;

	bool old_softraw;





	if (strict_strtoul(buf, 10, &value) || value > 1)

	err = kstrtouint(buf, 10, &value);

	if (err)

		return err;



	if (value > 1)

		return -EINVAL;

		return -EINVAL;





	if (atkbd->softraw != value) {

	if (atkbd->softraw != value) {

drivers/input/keyboard/lm8323.c

+5 −6
Original line number Original line Diff line number Diff line
@@ -545,13 +545,12 @@ static ssize_t lm8323_pwm_store_time(struct device *dev, 
{

{

	struct led_classdev *led_cdev = dev_get_drvdata(dev);

	struct led_classdev *led_cdev = dev_get_drvdata(dev);

	struct lm8323_pwm *pwm = cdev_to_pwm(led_cdev);

	struct lm8323_pwm *pwm = cdev_to_pwm(led_cdev);

	int ret;

	int ret, time;

	unsigned long time;





	ret = strict_strtoul(buf, 10, &time);

	ret = kstrtoint(buf, 10, &time);

	/* Numbers only, please. */

	/* Numbers only, please. */

	if (ret)

	if (ret)

		return -EINVAL;

		return ret;





	pwm->fade_time = time;

	pwm->fade_time = time;
@@ -613,9 +612,9 @@ static ssize_t lm8323_set_disable(struct device *dev, 
{

{

	struct lm8323_chip *lm = dev_get_drvdata(dev);

	struct lm8323_chip *lm = dev_get_drvdata(dev);

	int ret;

	int ret;

	unsigned long i;

	unsigned int i;





	ret = strict_strtoul(buf, 10, &i);

	ret = kstrtouint(buf, 10, &i);





	mutex_lock(&lm->lock);

	mutex_lock(&lm->lock);

	lm->kp_enabled = !i;

	lm->kp_enabled = !i;

drivers/input/misc/adxl34x.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -451,10 +451,10 @@ static ssize_t adxl34x_disable_store(struct device *dev, 
				     const char *buf, size_t count)

				     const char *buf, size_t count)

{

{

	struct adxl34x *ac = dev_get_drvdata(dev);

	struct adxl34x *ac = dev_get_drvdata(dev);

	unsigned long val;

	unsigned int val;

	int error;

	int error;





	error = strict_strtoul(buf, 10, &val);

	error = kstrtouint(buf, 10, &val);

	if (error)

	if (error)

		return error;

		return error;
@@ -540,10 +540,10 @@ static ssize_t adxl34x_rate_store(struct device *dev, 
				  const char *buf, size_t count)

				  const char *buf, size_t count)

{

{

	struct adxl34x *ac = dev_get_drvdata(dev);

	struct adxl34x *ac = dev_get_drvdata(dev);

	unsigned long val;

	unsigned char val;

	int error;

	int error;





	error = strict_strtoul(buf, 10, &val);

	error = kstrtou8(buf, 10, &val);

	if (error)

	if (error)

		return error;

		return error;
@@ -575,10 +575,10 @@ static ssize_t adxl34x_autosleep_store(struct device *dev, 
				  const char *buf, size_t count)

				  const char *buf, size_t count)

{

{

	struct adxl34x *ac = dev_get_drvdata(dev);

	struct adxl34x *ac = dev_get_drvdata(dev);

	unsigned long val;

	unsigned int val;

	int error;

	int error;





	error = strict_strtoul(buf, 10, &val);

	error = kstrtouint(buf, 10, &val);

	if (error)

	if (error)

		return error;

		return error;
@@ -622,13 +622,13 @@ static ssize_t adxl34x_write_store(struct device *dev, 
				   const char *buf, size_t count)

				   const char *buf, size_t count)

{

{

	struct adxl34x *ac = dev_get_drvdata(dev);

	struct adxl34x *ac = dev_get_drvdata(dev);

	unsigned long val;

	unsigned int val;

	int error;

	int error;





	/*

	/*

	 * This allows basic ADXL register write access for debug purposes.

	 * This allows basic ADXL register write access for debug purposes.

	 */

	 */

	error = strict_strtoul(buf, 16, &val);

	error = kstrtouint(buf, 16, &val);

	if (error)

	if (error)

		return error;

		return error;

drivers/input/misc/ati_remote2.c

+11 −8
Original line number Original line Diff line number Diff line
@@ -41,13 +41,13 @@ static int ati_remote2_set_mask(const char *val, 
				const struct kernel_param *kp,

				const struct kernel_param *kp,

				unsigned int max)

				unsigned int max)

{

{

	unsigned long mask;

	unsigned int mask;

	int ret;

	int ret;





	if (!val)

	if (!val)

		return -EINVAL;

		return -EINVAL;





	ret = strict_strtoul(val, 0, &mask);

	ret = kstrtouint(val, 0, &mask);

	if (ret)

	if (ret)

		return ret;

		return ret;
@@ -719,11 +719,12 @@ static ssize_t ati_remote2_store_channel_mask(struct device *dev, 
	struct usb_device *udev = to_usb_device(dev);

	struct usb_device *udev = to_usb_device(dev);

	struct usb_interface *intf = usb_ifnum_to_if(udev, 0);

	struct usb_interface *intf = usb_ifnum_to_if(udev, 0);

	struct ati_remote2 *ar2 = usb_get_intfdata(intf);

	struct ati_remote2 *ar2 = usb_get_intfdata(intf);

	unsigned long mask;

	unsigned int mask;

	int r;

	int r;





	if (strict_strtoul(buf, 0, &mask))

	r = kstrtouint(buf, 0, &mask);

		return -EINVAL;

	if (r)

		return r;





	if (mask & ~ATI_REMOTE2_MAX_CHANNEL_MASK)

	if (mask & ~ATI_REMOTE2_MAX_CHANNEL_MASK)

		return -EINVAL;

		return -EINVAL;
@@ -768,10 +769,12 @@ static ssize_t ati_remote2_store_mode_mask(struct device *dev, 
	struct usb_device *udev = to_usb_device(dev);

	struct usb_device *udev = to_usb_device(dev);

	struct usb_interface *intf = usb_ifnum_to_if(udev, 0);

	struct usb_interface *intf = usb_ifnum_to_if(udev, 0);

	struct ati_remote2 *ar2 = usb_get_intfdata(intf);

	struct ati_remote2 *ar2 = usb_get_intfdata(intf);

	unsigned long mask;

	unsigned int mask;

	int err;





	if (strict_strtoul(buf, 0, &mask))

	err = kstrtouint(buf, 0, &mask);

		return -EINVAL;

	if (err)

		return err;





	if (mask & ~ATI_REMOTE2_MAX_MODE_MASK)

	if (mask & ~ATI_REMOTE2_MAX_MODE_MASK)

		return -EINVAL;

		return -EINVAL;