Commit a8bc8cc1 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Greg Kroah-Hartman
Browse files

usb: gadget: Use kstrtobool() instead of strtobool() 



strtobool() is the same as kstrtobool().
However, the latter is more used within the kernel.

In order to remove strtobool() and slightly simplify kstrtox.h, switch to
the other function name.

While at it, include the corresponding header file (<linux/kstrtox.h>)

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/09bc980d8432a4b5f7d88388ec0df5b085583139.1667336095.git.christophe.jaillet@wanadoo.fr


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

drivers/usb/gadget/configfs.c

+2 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include <linux/module.h>

#include <linux/slab.h>

#include <linux/device.h>

#include <linux/kstrtox.h>

#include <linux/nls.h>

#include <linux/usb/composite.h>

#include <linux/usb/gadget_configfs.h>
@@ -800,7 +801,7 @@ static ssize_t os_desc_use_store(struct config_item *item, const char *page, 
	bool use;



	mutex_lock(&gi->lock);

	ret = strtobool(page, &use);

	ret = kstrtobool(page, &use);

	if (!ret) {

		gi->use_os_desc = use;

		ret = len;

drivers/usb/gadget/function/f_mass_storage.c

+2 −1
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ 
#include <linux/fcntl.h>

#include <linux/file.h>

#include <linux/fs.h>

#include <linux/kstrtox.h>

#include <linux/kthread.h>

#include <linux/sched/signal.h>

#include <linux/limits.h>
@@ -3387,7 +3388,7 @@ static ssize_t fsg_opts_stall_store(struct config_item *item, const char *page, 
		return -EBUSY;

	}



	ret = strtobool(page, &stall);

	ret = kstrtobool(page, &stall);

	if (!ret) {

		opts->common->can_stall = stall;

		ret = len;

drivers/usb/gadget/function/storage_common.c

+5 −4
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/blkdev.h>

#include <linux/file.h>

#include <linux/fs.h>

#include <linux/kstrtox.h>

#include <linux/usb/composite.h>



#include "storage_common.h"
@@ -396,7 +397,7 @@ ssize_t fsg_store_ro(struct fsg_lun *curlun, struct rw_semaphore *filesem, 
	ssize_t		rc;

	bool		ro;



	rc = strtobool(buf, &ro);

	rc = kstrtobool(buf, &ro);

	if (rc)

		return rc;
@@ -419,7 +420,7 @@ ssize_t fsg_store_nofua(struct fsg_lun *curlun, const char *buf, size_t count) 
	bool		nofua;

	int		ret;



	ret = strtobool(buf, &nofua);

	ret = kstrtobool(buf, &nofua);

	if (ret)

		return ret;
@@ -470,7 +471,7 @@ ssize_t fsg_store_cdrom(struct fsg_lun *curlun, struct rw_semaphore *filesem, 
	bool		cdrom;

	int		ret;



	ret = strtobool(buf, &cdrom);

	ret = kstrtobool(buf, &cdrom);

	if (ret)

		return ret;
@@ -493,7 +494,7 @@ ssize_t fsg_store_removable(struct fsg_lun *curlun, const char *buf, 
	bool		removable;

	int		ret;



	ret = strtobool(buf, &removable);

	ret = kstrtobool(buf, &removable);

	if (ret)

		return ret;

drivers/usb/gadget/function/u_serial.c

+2 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/export.h>

#include <linux/module.h>

#include <linux/console.h>

#include <linux/kstrtox.h>

#include <linux/kthread.h>

#include <linux/workqueue.h>

#include <linux/kfifo.h>
@@ -1070,7 +1071,7 @@ ssize_t gserial_set_console(unsigned char port_num, const char *page, size_t cou 
	bool enable;

	int ret;



	ret = strtobool(page, &enable);

	ret = kstrtobool(page, &enable);

	if (ret)

		return ret;

drivers/usb/gadget/legacy/serial.c

+2 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


#include <linux/kernel.h>

#include <linux/device.h>

#include <linux/kstrtox.h>

#include <linux/module.h>

#include <linux/tty.h>

#include <linux/tty_flip.h>
@@ -109,7 +110,7 @@ static int enable_set(const char *s, const struct kernel_param *kp) 
	if (!s)	/* called for no-arg enable == default */

		return 0;



	ret = strtobool(s, &do_enable);

	ret = kstrtobool(s, &do_enable);

	if (ret || enable == do_enable)

		return ret;