usb: core: use sysfs_emit() instead of sprintf()

Follow the advice in Documentation/filesystems/sysfs.rst:
show() should only use sysfs_emit() or sysfs_emit_at() when formatting
the value to be returned to user space.

Signed-off-by: Jiayi Li <lijiayi@kylinos.cn>
Link: https://lore.kernel.org/r/20241023085429.2865488-1-lijiayi@kylinos.cn
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/core/endpoint.c b/drivers/usb/core/endpoint.c
index 4b38b87a13438d382d3bd0d1ace2df069fbb0d00..e48399401608775bf73ba767c979519cc566ad35 100644 (file)
--- a/drivers/usb/core/endpoint.c
+++ b/drivers/usb/core/endpoint.c
@@ -14,6 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/spinlock.h>
 #include <linux/slab.h>
+#include <linux/sysfs.h>
 #include <linux/usb.h>
 #include "usb.h"
 
@@ -39,7 +40,7 @@ static ssize_t field##_show(struct device *dev,                       \
                               char *buf)                       \
 {                                                              \
        struct ep_device *ep = to_ep_device(dev);               \
-       return sprintf(buf, format_string, ep->desc->field);    \
+       return sysfs_emit(buf, format_string, ep->desc->field); \
 }                                                              \
 static DEVICE_ATTR_RO(field)
 
@@ -52,7 +53,7 @@ static ssize_t wMaxPacketSize_show(struct device *dev,
                                   struct device_attribute *attr, char *buf)
 {
        struct ep_device *ep = to_ep_device(dev);
-       return sprintf(buf, "%04x\n", usb_endpoint_maxp(ep->desc));
+       return sysfs_emit(buf, "%04x\n", usb_endpoint_maxp(ep->desc));
 }
 static DEVICE_ATTR_RO(wMaxPacketSize);
 
@@ -76,7 +77,7 @@ static ssize_t type_show(struct device *dev, struct device_attribute *attr,
                type = "Interrupt";
                break;
        }
-       return sprintf(buf, "%s\n", type);
+       return sysfs_emit(buf, "%s\n", type);
 }
 static DEVICE_ATTR_RO(type);
 
@@ -95,7 +96,7 @@ static ssize_t interval_show(struct device *dev, struct device_attribute *attr,
                interval /= 1000;
        }
 
-       return sprintf(buf, "%d%cs\n", interval, unit);
+       return sysfs_emit(buf, "%d%cs\n", interval, unit);
 }
 static DEVICE_ATTR_RO(interval);
 
@@ -111,7 +112,7 @@ static ssize_t direction_show(struct device *dev, struct device_attribute *attr,
                direction = "in";
        else
                direction = "out";
-       return sprintf(buf, "%s\n", direction);
+       return sysfs_emit(buf, "%s\n", direction);
 }
 static DEVICE_ATTR_RO(direction);
 

diff --git a/drivers/usb/core/ledtrig-usbport.c b/drivers/usb/core/ledtrig-usbport.c
index 85c999f71ad7c2caae981c1572b95e1d26a44545..5e3c515991f3f100e774cfe8a5c28225a2d00c1f 100644 (file)
--- a/drivers/usb/core/ledtrig-usbport.c
+++ b/drivers/usb/core/ledtrig-usbport.c
@@ -10,6 +10,7 @@
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/slab.h>
+#include <linux/sysfs.h>
 #include <linux/usb.h>
 #include <linux/usb/of.h>
 
@@ -87,7 +88,7 @@ static ssize_t usbport_trig_port_show(struct device *dev,
                                                      struct usbport_trig_port,
                                                      attr);
 
-       return sprintf(buf, "%d\n", port->observed) + 1;
+       return sysfs_emit(buf, "%d\n", port->observed) + 1;
 }
 
 static ssize_t usbport_trig_port_store(struct device *dev,

diff --git a/drivers/usb/core/port.c b/drivers/usb/core/port.c
index e7da2fca11a48cf9c3d53cd53d124d65a1cd751f..45d7af00f8d17eecbf754137a372504254303886 100644 (file)
--- a/drivers/usb/core/port.c
+++ b/drivers/usb/core/port.c
@@ -9,6 +9,7 @@
 
 #include <linux/kstrtox.h>
 #include <linux/slab.h>
+#include <linux/sysfs.h>
 #include <linux/pm_qos.h>
 #include <linux/component.h>
 #include <linux/usb/of.h>
@@ -166,7 +167,7 @@ static ssize_t location_show(struct device *dev,
 {
        struct usb_port *port_dev = to_usb_port(dev);
 
-       return sprintf(buf, "0x%08x\n", port_dev->location);
+       return sysfs_emit(buf, "0x%08x\n", port_dev->location);
 }
 static DEVICE_ATTR_RO(location);
 
@@ -191,7 +192,7 @@ static ssize_t connect_type_show(struct device *dev,
                break;
        }
 
-       return sprintf(buf, "%s\n", result);
+       return sysfs_emit(buf, "%s\n", result);
 }
 static DEVICE_ATTR_RO(connect_type);
 
@@ -210,7 +211,7 @@ static ssize_t over_current_count_show(struct device *dev,
 {
        struct usb_port *port_dev = to_usb_port(dev);
 
-       return sprintf(buf, "%u\n", port_dev->over_current_count);
+       return sysfs_emit(buf, "%u\n", port_dev->over_current_count);
 }
 static DEVICE_ATTR_RO(over_current_count);
 
@@ -219,7 +220,7 @@ static ssize_t quirks_show(struct device *dev,
 {
        struct usb_port *port_dev = to_usb_port(dev);
 
-       return sprintf(buf, "%08x\n", port_dev->quirks);
+       return sysfs_emit(buf, "%08x\n", port_dev->quirks);
 }
 
 static ssize_t quirks_store(struct device *dev, struct device_attribute *attr,
@@ -254,7 +255,7 @@ static ssize_t usb3_lpm_permit_show(struct device *dev,
                        p = "0";
        }
 
-       return sprintf(buf, "%s\n", p);
+       return sysfs_emit(buf, "%s\n", p);
 }
 
 static ssize_t usb3_lpm_permit_store(struct device *dev,