usb: sysfs: use kstrtobool() if possible
authorGuan-Yu Lin <guanyulin@google.com>
Fri, 2 Feb 2024 03:00:42 +0000 (03:00 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 17 Feb 2024 16:00:33 +0000 (17:00 +0100)
Replace the self-rolled implementations with kstrtobool(). This reduces
the maintenance efforts in the future.

Signed-off-by: Guan-Yu Lin <guanyulin@google.com>
Link: https://lore.kernel.org/r/20240202030301.2396374-1-guanyulin@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/core/sysfs.c

index 5d21718afb05cff29a985dcd1678849dc706dfe6..e67826ec053e19f1e90112bb3fb2c254febf7b6f 100644 (file)
@@ -273,9 +273,10 @@ static ssize_t avoid_reset_quirk_store(struct device *dev,
                                      const char *buf, size_t count)
 {
        struct usb_device       *udev = to_usb_device(dev);
-       int                     val, rc;
+       bool                    val;
+       int                     rc;
 
-       if (sscanf(buf, "%d", &val) != 1 || val < 0 || val > 1)
+       if (kstrtobool(buf, &val) != 0)
                return -EINVAL;
        rc = usb_lock_device_interruptible(udev);
        if (rc < 0)
@@ -322,13 +323,14 @@ static ssize_t persist_store(struct device *dev, struct device_attribute *attr,
                             const char *buf, size_t count)
 {
        struct usb_device *udev = to_usb_device(dev);
-       int value, rc;
+       bool value;
+       int rc;
 
        /* Hubs are always enabled for USB_PERSIST */
        if (udev->descriptor.bDeviceClass == USB_CLASS_HUB)
                return -EPERM;
 
-       if (sscanf(buf, "%d", &value) != 1)
+       if (kstrtobool(buf, &value) != 0)
                return -EINVAL;
 
        rc = usb_lock_device_interruptible(udev);
@@ -739,14 +741,14 @@ static ssize_t authorized_store(struct device *dev,
 {
        ssize_t result;
        struct usb_device *usb_dev = to_usb_device(dev);
-       unsigned val;
-       result = sscanf(buf, "%u\n", &val);
-       if (result != 1)
+       bool val;
+
+       if (kstrtobool(buf, &val) != 0)
                result = -EINVAL;
-       else if (val == 0)
-               result = usb_deauthorize_device(usb_dev);
-       else
+       else if (val)
                result = usb_authorize_device(usb_dev);
+       else
+               result = usb_deauthorize_device(usb_dev);
        return result < 0 ? result : size;
 }
 static DEVICE_ATTR_IGNORE_LOCKDEP(authorized, S_IRUGO | S_IWUSR,