microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

usb: core: sysfs: convert sysfs snprintf to sysfs_emit 

Fix up all sysfs show entries to use sysfs_emit

Signed-off-by: Xuezhi Zhang <zhangxuezhi1@coolpad.com>
Link: https://lore.kernel.org/r/20220624121238.134256-1-zhangxuezhi1@coolpad.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Xuezhi Zhang 2022-06-24 20:12:38 +08:00 коммит произвёл Greg Kroah-Hartman
Родитель e6aa42f937
Коммит 6569689e78
1 изменённых файлов: 40 добавлений и 39 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

79
drivers/usb/core/sysfs.c
Просмотреть файл

@ -35,7 +35,7 @@ static ssize_t field##_show(struct device *dev, \
return -EINTR; \ return -EINTR; \
actconfig = udev->actconfig; \ actconfig = udev->actconfig; \
if (actconfig) \ if (actconfig) \
rc = sprintf(buf, format_string, \ rc = sysfs_emit(buf, format_string, \
actconfig->desc.field); \ actconfig->desc.field); \
usb_unlock_device(udev); \ usb_unlock_device(udev); \
return rc; \ return rc; \
@ -61,7 +61,7 @@ static ssize_t bMaxPower_show(struct device *dev,
return -EINTR; return -EINTR;
actconfig = udev->actconfig; actconfig = udev->actconfig;
if (actconfig) if (actconfig)
rc = sprintf(buf, "%dmA\n", usb_get_max_power(udev, actconfig)); rc = sysfs_emit(buf, "%dmA\n", usb_get_max_power(udev, actconfig));
usb_unlock_device(udev); usb_unlock_device(udev);
return rc; return rc;
} }
@ -80,7 +80,7 @@ static ssize_t configuration_show(struct device *dev,
return -EINTR; return -EINTR;
actconfig = udev->actconfig; actconfig = udev->actconfig;
if (actconfig && actconfig->string) if (actconfig && actconfig->string)
rc = sprintf(buf, "%s\n", actconfig->string); rc = sysfs_emit(buf, "%s\n", actconfig->string);
usb_unlock_device(udev); usb_unlock_device(udev);
return rc; return rc;
} }
@ -114,7 +114,7 @@ static ssize_t devspec_show(struct device *dev, struct device_attribute *attr,
{ {
struct device_node *of_node = dev->of_node; struct device_node *of_node = dev->of_node;
return sprintf(buf, "%pOF\n", of_node); return sysfs_emit(buf, "%pOF\n", of_node);
} }
static DEVICE_ATTR_RO(devspec); static DEVICE_ATTR_RO(devspec);
#endif #endif
@ -131,7 +131,7 @@ static ssize_t name##_show(struct device *dev, \
retval = usb_lock_device_interruptible(udev); \ retval = usb_lock_device_interruptible(udev); \
if (retval < 0) \ if (retval < 0) \
return -EINTR; \ return -EINTR; \
retval = sprintf(buf, "%s\n", udev->name); \ retval = sysfs_emit(buf, "%s\n", udev->name); \
usb_unlock_device(udev); \ usb_unlock_device(udev); \
return retval; \ return retval; \
} \ } \
@ -175,7 +175,7 @@ static ssize_t speed_show(struct device *dev, struct device_attribute *attr,
default: default:
speed = "unknown"; speed = "unknown";
} }
return sprintf(buf, "%s\n", speed); return sysfs_emit(buf, "%s\n", speed);
} }
static DEVICE_ATTR_RO(speed); static DEVICE_ATTR_RO(speed);
@ -185,7 +185,7 @@ static ssize_t rx_lanes_show(struct device *dev, struct device_attribute *attr,
struct usb_device *udev; struct usb_device *udev;
udev = to_usb_device(dev); udev = to_usb_device(dev);
return sprintf(buf, "%d\n", udev->rx_lanes); return sysfs_emit(buf, "%d\n", udev->rx_lanes);
} }
static DEVICE_ATTR_RO(rx_lanes); static DEVICE_ATTR_RO(rx_lanes);
@ -195,7 +195,7 @@ static ssize_t tx_lanes_show(struct device *dev, struct device_attribute *attr,
struct usb_device *udev; struct usb_device *udev;
udev = to_usb_device(dev); udev = to_usb_device(dev);
return sprintf(buf, "%d\n", udev->tx_lanes); return sysfs_emit(buf, "%d\n", udev->tx_lanes);
} }
static DEVICE_ATTR_RO(tx_lanes); static DEVICE_ATTR_RO(tx_lanes);
@ -205,7 +205,7 @@ static ssize_t busnum_show(struct device *dev, struct device_attribute *attr,
struct usb_device *udev; struct usb_device *udev;
udev = to_usb_device(dev); udev = to_usb_device(dev);
return sprintf(buf, "%d\n", udev->bus->busnum); return sysfs_emit(buf, "%d\n", udev->bus->busnum);
} }
static DEVICE_ATTR_RO(busnum); static DEVICE_ATTR_RO(busnum);
@ -215,7 +215,7 @@ static ssize_t devnum_show(struct device *dev, struct device_attribute *attr,
struct usb_device *udev; struct usb_device *udev;
udev = to_usb_device(dev); udev = to_usb_device(dev);
return sprintf(buf, "%d\n", udev->devnum); return sysfs_emit(buf, "%d\n", udev->devnum);
} }
static DEVICE_ATTR_RO(devnum); static DEVICE_ATTR_RO(devnum);
@ -225,7 +225,7 @@ static ssize_t devpath_show(struct device *dev, struct device_attribute *attr,
struct usb_device *udev; struct usb_device *udev;
udev = to_usb_device(dev); udev = to_usb_device(dev);
return sprintf(buf, "%s\n", udev->devpath); return sysfs_emit(buf, "%s\n", udev->devpath);
} }
static DEVICE_ATTR_RO(devpath); static DEVICE_ATTR_RO(devpath);
@ -237,7 +237,7 @@ static ssize_t version_show(struct device *dev, struct device_attribute *attr,
udev = to_usb_device(dev); udev = to_usb_device(dev);
bcdUSB = le16_to_cpu(udev->descriptor.bcdUSB); bcdUSB = le16_to_cpu(udev->descriptor.bcdUSB);
return sprintf(buf, "%2x.%02x\n", bcdUSB >> 8, bcdUSB & 0xff); return sysfs_emit(buf, "%2x.%02x\n", bcdUSB >> 8, bcdUSB & 0xff);
} }
static DEVICE_ATTR_RO(version); static DEVICE_ATTR_RO(version);
@ -247,7 +247,7 @@ static ssize_t maxchild_show(struct device *dev, struct device_attribute *attr,
struct usb_device *udev; struct usb_device *udev;
udev = to_usb_device(dev); udev = to_usb_device(dev);
return sprintf(buf, "%d\n", udev->maxchild); return sysfs_emit(buf, "%d\n", udev->maxchild);
} }
static DEVICE_ATTR_RO(maxchild); static DEVICE_ATTR_RO(maxchild);
@ -257,7 +257,7 @@ static ssize_t quirks_show(struct device *dev, struct device_attribute *attr,
struct usb_device *udev; struct usb_device *udev;
udev = to_usb_device(dev); udev = to_usb_device(dev);
return sprintf(buf, "0x%x\n", udev->quirks); return sysfs_emit(buf, "0x%x\n", udev->quirks);
} }
static DEVICE_ATTR_RO(quirks); static DEVICE_ATTR_RO(quirks);
@ -267,7 +267,7 @@ static ssize_t avoid_reset_quirk_show(struct device *dev,
struct usb_device *udev; struct usb_device *udev;
udev = to_usb_device(dev); udev = to_usb_device(dev);
return sprintf(buf, "%d\n", !!(udev->quirks & USB_QUIRK_RESET)); return sysfs_emit(buf, "%d\n", !!(udev->quirks & USB_QUIRK_RESET));
} }
static ssize_t avoid_reset_quirk_store(struct device *dev, static ssize_t avoid_reset_quirk_store(struct device *dev,
@ -297,7 +297,7 @@ static ssize_t urbnum_show(struct device *dev, struct device_attribute *attr,
struct usb_device *udev; struct usb_device *udev;
udev = to_usb_device(dev); udev = to_usb_device(dev);
return sprintf(buf, "%d\n", atomic_read(&udev->urbnum)); return sysfs_emit(buf, "%d\n", atomic_read(&udev->urbnum));
} }
static DEVICE_ATTR_RO(urbnum); static DEVICE_ATTR_RO(urbnum);
@ -305,8 +305,8 @@ static ssize_t ltm_capable_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
if (usb_device_supports_ltm(to_usb_device(dev))) if (usb_device_supports_ltm(to_usb_device(dev)))
return sprintf(buf, "%s\n", "yes"); return sysfs_emit(buf, "%s\n", "yes");
return sprintf(buf, "%s\n", "no"); return sysfs_emit(buf, "%s\n", "no");
} }
static DEVICE_ATTR_RO(ltm_capable); static DEVICE_ATTR_RO(ltm_capable);
@ -317,7 +317,7 @@ static ssize_t persist_show(struct device *dev, struct device_attribute *attr,
{ {
struct usb_device *udev = to_usb_device(dev); struct usb_device *udev = to_usb_device(dev);
return sprintf(buf, "%d\n", udev->persist_enabled); return sysfs_emit(buf, "%d\n", udev->persist_enabled);
} }
static ssize_t persist_store(struct device *dev, struct device_attribute *attr, static ssize_t persist_store(struct device *dev, struct device_attribute *attr,
@ -372,7 +372,7 @@ static ssize_t connected_duration_show(struct device *dev,
{ {
struct usb_device *udev = to_usb_device(dev); struct usb_device *udev = to_usb_device(dev);
return sprintf(buf, "%u\n", return sysfs_emit(buf, "%u\n",
jiffies_to_msecs(jiffies - udev->connect_time)); jiffies_to_msecs(jiffies - udev->connect_time));
} }
static DEVICE_ATTR_RO(connected_duration); static DEVICE_ATTR_RO(connected_duration);
@ -394,14 +394,14 @@ static ssize_t active_duration_show(struct device *dev,
duration = jiffies_to_msecs(jiffies + udev->active_duration); duration = jiffies_to_msecs(jiffies + udev->active_duration);
else else
duration = jiffies_to_msecs(udev->active_duration); duration = jiffies_to_msecs(udev->active_duration);
return sprintf(buf, "%u\n", duration); return sysfs_emit(buf, "%u\n", duration);
} }
static DEVICE_ATTR_RO(active_duration); static DEVICE_ATTR_RO(active_duration);
static ssize_t autosuspend_show(struct device *dev, static ssize_t autosuspend_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
return sprintf(buf, "%d\n", dev->power.autosuspend_delay / 1000); return sysfs_emit(buf, "%d\n", dev->power.autosuspend_delay / 1000);
} }
static ssize_t autosuspend_store(struct device *dev, static ssize_t autosuspend_store(struct device *dev,
@ -442,7 +442,7 @@ static ssize_t level_show(struct device *dev, struct device_attribute *attr,
warn_level(); warn_level();
if (udev->state != USB_STATE_SUSPENDED && !udev->dev.power.runtime_auto) if (udev->state != USB_STATE_SUSPENDED && !udev->dev.power.runtime_auto)
p = on_string; p = on_string;
return sprintf(buf, "%s\n", p); return sysfs_emit(buf, "%s\n", p);
} }
static ssize_t level_store(struct device *dev, struct device_attribute *attr, static ssize_t level_store(struct device *dev, struct device_attribute *attr,
@ -490,7 +490,7 @@ static ssize_t usb2_hardware_lpm_show(struct device *dev,
else else
p = "disabled"; p = "disabled";
return sprintf(buf, "%s\n", p); return sysfs_emit(buf, "%s\n", p);
} }
static ssize_t usb2_hardware_lpm_store(struct device *dev, static ssize_t usb2_hardware_lpm_store(struct device *dev,
@ -529,7 +529,7 @@ static ssize_t usb2_lpm_l1_timeout_show(struct device *dev,
char *buf) char *buf)
{ {
struct usb_device *udev = to_usb_device(dev); struct usb_device *udev = to_usb_device(dev);
return sprintf(buf, "%d\n", udev->l1_params.timeout); return sysfs_emit(buf, "%d\n", udev->l1_params.timeout);
} }
static ssize_t usb2_lpm_l1_timeout_store(struct device *dev, static ssize_t usb2_lpm_l1_timeout_store(struct device *dev,
@ -552,7 +552,7 @@ static ssize_t usb2_lpm_besl_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct usb_device *udev = to_usb_device(dev); struct usb_device *udev = to_usb_device(dev);
return sprintf(buf, "%d\n", udev->l1_params.besl); return sysfs_emit(buf, "%d\n", udev->l1_params.besl);
} }
static ssize_t usb2_lpm_besl_store(struct device *dev, static ssize_t usb2_lpm_besl_store(struct device *dev,
@ -589,7 +589,7 @@ static ssize_t usb3_hardware_lpm_u1_show(struct device *dev,
usb_unlock_device(udev); usb_unlock_device(udev);
return sprintf(buf, "%s\n", p); return sysfs_emit(buf, "%s\n", p);
} }
static DEVICE_ATTR_RO(usb3_hardware_lpm_u1); static DEVICE_ATTR_RO(usb3_hardware_lpm_u1);
@ -611,7 +611,7 @@ static ssize_t usb3_hardware_lpm_u2_show(struct device *dev,
usb_unlock_device(udev); usb_unlock_device(udev);
return sprintf(buf, "%s\n", p); return sysfs_emit(buf, "%s\n", p);
} }
static DEVICE_ATTR_RO(usb3_hardware_lpm_u2); static DEVICE_ATTR_RO(usb3_hardware_lpm_u2);
@ -694,7 +694,7 @@ field##_show(struct device *dev, struct device_attribute *attr, \
struct usb_device *udev; \ struct usb_device *udev; \
\ \
udev = to_usb_device(dev); \ udev = to_usb_device(dev); \
return sprintf(buf, format_string, \ return sysfs_emit(buf, format_string, \
le16_to_cpu(udev->descriptor.field)); \ le16_to_cpu(udev->descriptor.field)); \
} \ } \
static DEVICE_ATTR_RO(field) static DEVICE_ATTR_RO(field)
@ -711,7 +711,7 @@ field##_show(struct device *dev, struct device_attribute *attr, \
struct usb_device *udev; \ struct usb_device *udev; \
\ \
udev = to_usb_device(dev); \ udev = to_usb_device(dev); \
return sprintf(buf, format_string, udev->descriptor.field); \ return sysfs_emit(buf, format_string, udev->descriptor.field); \
} \ } \
static DEVICE_ATTR_RO(field) static DEVICE_ATTR_RO(field)
@ -727,7 +727,7 @@ static ssize_t authorized_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct usb_device *usb_dev = to_usb_device(dev); struct usb_device *usb_dev = to_usb_device(dev);
return snprintf(buf, PAGE_SIZE, "%u\n", usb_dev->authorized); return sysfs_emit(buf, "%u\n", usb_dev->authorized);
} }
/* /*
@ -918,7 +918,7 @@ static ssize_t authorized_default_show(struct device *dev,
struct usb_hcd *hcd; struct usb_hcd *hcd;
hcd = bus_to_hcd(usb_bus); hcd = bus_to_hcd(usb_bus);
return snprintf(buf, PAGE_SIZE, "%u\n", hcd->dev_policy); return sysfs_emit(buf, "%u\n", hcd->dev_policy);
} }
static ssize_t authorized_default_store(struct device *dev, static ssize_t authorized_default_store(struct device *dev,
@ -957,7 +957,7 @@ static ssize_t interface_authorized_default_show(struct device *dev,
struct usb_device *usb_dev = to_usb_device(dev); struct usb_device *usb_dev = to_usb_device(dev);
struct usb_hcd *hcd = bus_to_hcd(usb_dev->bus); struct usb_hcd *hcd = bus_to_hcd(usb_dev->bus);
return sprintf(buf, "%u\n", !!HCD_INTF_AUTHORIZED(hcd)); return sysfs_emit(buf, "%u\n", !!HCD_INTF_AUTHORIZED(hcd));
} }
/* /*
@ -1066,7 +1066,7 @@ iad_##field##_show(struct device *dev, struct device_attribute *attr, \
{ \ { \
struct usb_interface *intf = to_usb_interface(dev); \ struct usb_interface *intf = to_usb_interface(dev); \
\ \
return sprintf(buf, format_string, \ return sysfs_emit(buf, format_string, \
intf->intf_assoc->field); \ intf->intf_assoc->field); \
} \ } \
static DEVICE_ATTR_RO(iad_##field) static DEVICE_ATTR_RO(iad_##field)
@ -1085,7 +1085,7 @@ field##_show(struct device *dev, struct device_attribute *attr, \
{ \ { \
struct usb_interface *intf = to_usb_interface(dev); \ struct usb_interface *intf = to_usb_interface(dev); \
\ \
return sprintf(buf, format_string, \ return sysfs_emit(buf, format_string, \
intf->cur_altsetting->desc.field); \ intf->cur_altsetting->desc.field); \
} \ } \
static DEVICE_ATTR_RO(field) static DEVICE_ATTR_RO(field)
@ -1107,7 +1107,7 @@ static ssize_t interface_show(struct device *dev, struct device_attribute *attr,
string = READ_ONCE(intf->cur_altsetting->string); string = READ_ONCE(intf->cur_altsetting->string);
if (!string) if (!string)
return 0; return 0;
return sprintf(buf, "%s\n", string); return sysfs_emit(buf, "%s\n", string);
} }
static DEVICE_ATTR_RO(interface); static DEVICE_ATTR_RO(interface);
@ -1122,7 +1122,8 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
udev = interface_to_usbdev(intf); udev = interface_to_usbdev(intf);
alt = READ_ONCE(intf->cur_altsetting); alt = READ_ONCE(intf->cur_altsetting);
return sprintf(buf, "usb:v%04Xp%04Xd%04Xdc%02Xdsc%02Xdp%02X" return sysfs_emit(buf,
"usb:v%04Xp%04Xd%04Xdc%02Xdsc%02Xdp%02X"
"ic%02Xisc%02Xip%02Xin%02X\n", "ic%02Xisc%02Xip%02Xin%02X\n",
le16_to_cpu(udev->descriptor.idVendor), le16_to_cpu(udev->descriptor.idVendor),
le16_to_cpu(udev->descriptor.idProduct), le16_to_cpu(udev->descriptor.idProduct),
@ -1150,7 +1151,7 @@ static ssize_t supports_autosuspend_show(struct device *dev,
s = (!dev->driver || to_usb_driver(dev->driver)->supports_autosuspend); s = (!dev->driver || to_usb_driver(dev->driver)->supports_autosuspend);
device_unlock(dev); device_unlock(dev);
return sprintf(buf, "%u\n", s); return sysfs_emit(buf, "%u\n", s);
} }
static DEVICE_ATTR_RO(supports_autosuspend); static DEVICE_ATTR_RO(supports_autosuspend);
@ -1163,7 +1164,7 @@ static ssize_t interface_authorized_show(struct device *dev,
{ {
struct usb_interface *intf = to_usb_interface(dev); struct usb_interface *intf = to_usb_interface(dev);
return sprintf(buf, "%u\n", intf->authorized); return sysfs_emit(buf, "%u\n", intf->authorized);
} }
/* /*