usb: core: 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: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/f01ef2ddaf12a6412127611617786adc1234e0b4.1667336095.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/core/port.c b/drivers/usb/core/port.c
index 38c1a4f4fdeae5025633727774a15eace5b4492f..015204fc67a108f57fa40549a3578c2e23d855d9 100644 (file)
--- a/drivers/usb/core/port.c
+++ b/drivers/usb/core/port.c
@@ -7,6 +7,7 @@
  * Author: Lan Tianyu <tianyu.lan@intel.com>
  */
 
+#include <linux/kstrtox.h>
 #include <linux/slab.h>
 #include <linux/pm_qos.h>
 #include <linux/component.h>
@@ -63,7 +64,7 @@ static ssize_t disable_store(struct device *dev, struct device_attribute *attr,
        bool disabled;
        int rc;
 
-       rc = strtobool(buf, &disabled);
+       rc = kstrtobool(buf, &disabled);
        if (rc)
                return rc;
 

diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
index 631574718d8ac80c0f6c22118b47c34277145411..8217032dfb85fa27200c1812ae068f317995494e 100644 (file)
--- a/drivers/usb/core/sysfs.c
+++ b/drivers/usb/core/sysfs.c
@@ -13,6 +13,7 @@
 
 
 #include <linux/kernel.h>
+#include <linux/kstrtox.h>
 #include <linux/string.h>
 #include <linux/usb.h>
 #include <linux/usb/hcd.h>
@@ -505,7 +506,7 @@ static ssize_t usb2_hardware_lpm_store(struct device *dev,
        if (ret < 0)
                return -EINTR;
 
-       ret = strtobool(buf, &value);
+       ret = kstrtobool(buf, &value);
 
        if (!ret) {
                udev->usb2_hw_lpm_allowed = value;
@@ -975,7 +976,7 @@ static ssize_t interface_authorized_default_store(struct device *dev,
        int rc = count;
        bool val;
 
-       if (strtobool(buf, &val) != 0)
+       if (kstrtobool(buf, &val) != 0)
                return -EINVAL;
 
        if (val)
@@ -1176,7 +1177,7 @@ static ssize_t interface_authorized_store(struct device *dev,
        struct usb_interface *intf = to_usb_interface(dev);
        bool val;
 
-       if (strtobool(buf, &val) != 0)
+       if (kstrtobool(buf, &val) != 0)
                return -EINVAL;
 
        if (val)