drivers/misc/mei/bus.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
Update all device attribute show callbacks in the MEI bus driver to use
sysfs_emit(), as recommended by Documentation/filesystems/sysfs.rst.
This improves consistency and aligns with current sysfs guidelines,
even though the existing use of sprintf/scnprintf is functionally safe.
Signed-off-by: Moon Hee Lee <moonhee.lee.ca@gmail.com>
---
drivers/misc/mei/bus.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c
index 67176caf5416..bc124a15006e 100644
--- a/drivers/misc/mei/bus.c
+++ b/drivers/misc/mei/bus.c
@@ -1156,7 +1156,7 @@ static ssize_t name_show(struct device *dev, struct device_attribute *a,
{
struct mei_cl_device *cldev = to_mei_cl_device(dev);
- return scnprintf(buf, PAGE_SIZE, "%s", cldev->name);
+ return sysfs_emit(buf, "%s", cldev->name);
}
static DEVICE_ATTR_RO(name);
@@ -1166,7 +1166,7 @@ static ssize_t uuid_show(struct device *dev, struct device_attribute *a,
struct mei_cl_device *cldev = to_mei_cl_device(dev);
const uuid_le *uuid = mei_me_cl_uuid(cldev->me_cl);
- return sprintf(buf, "%pUl", uuid);
+ return sysfs_emit(buf, "%pUl", uuid);
}
static DEVICE_ATTR_RO(uuid);
@@ -1176,7 +1176,7 @@ static ssize_t version_show(struct device *dev, struct device_attribute *a,
struct mei_cl_device *cldev = to_mei_cl_device(dev);
u8 version = mei_me_cl_ver(cldev->me_cl);
- return sprintf(buf, "%02X", version);
+ return sysfs_emit(buf, "%02X", version);
}
static DEVICE_ATTR_RO(version);
@@ -1187,8 +1187,7 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *a,
const uuid_le *uuid = mei_me_cl_uuid(cldev->me_cl);
u8 version = mei_me_cl_ver(cldev->me_cl);
- return scnprintf(buf, PAGE_SIZE, "mei:%s:%pUl:%02X:",
- cldev->name, uuid, version);
+ return sysfs_emit(buf, "mei:%s:%pUl:%02X:", cldev->name, uuid, version);
}
static DEVICE_ATTR_RO(modalias);
@@ -1198,7 +1197,7 @@ static ssize_t max_conn_show(struct device *dev, struct device_attribute *a,
struct mei_cl_device *cldev = to_mei_cl_device(dev);
u8 maxconn = mei_me_cl_max_conn(cldev->me_cl);
- return sprintf(buf, "%d", maxconn);
+ return sysfs_emit(buf, "%d", maxconn);
}
static DEVICE_ATTR_RO(max_conn);
@@ -1208,7 +1207,7 @@ static ssize_t fixed_show(struct device *dev, struct device_attribute *a,
struct mei_cl_device *cldev = to_mei_cl_device(dev);
u8 fixed = mei_me_cl_fixed(cldev->me_cl);
- return sprintf(buf, "%d", fixed);
+ return sysfs_emit(buf, "%d", fixed);
}
static DEVICE_ATTR_RO(fixed);
@@ -1218,7 +1217,7 @@ static ssize_t vtag_show(struct device *dev, struct device_attribute *a,
struct mei_cl_device *cldev = to_mei_cl_device(dev);
bool vt = mei_me_cl_vt(cldev->me_cl);
- return sprintf(buf, "%d", vt);
+ return sysfs_emit(buf, "%d", vt);
}
static DEVICE_ATTR_RO(vtag);
@@ -1228,7 +1227,7 @@ static ssize_t max_len_show(struct device *dev, struct device_attribute *a,
struct mei_cl_device *cldev = to_mei_cl_device(dev);
u32 maxlen = mei_me_cl_max_len(cldev->me_cl);
- return sprintf(buf, "%u", maxlen);
+ return sysfs_emit(buf, "%u", maxlen);
}
static DEVICE_ATTR_RO(max_len);
--
2.43.0
> Subject: [PATCH] mei: bus: replace sprintf/scnprintf with sysfs_emit in show > functions > > Update all device attribute show callbacks in the MEI bus driver to use > sysfs_emit(), as recommended by Documentation/filesystems/sysfs.rst. > > This improves consistency and aligns with current sysfs guidelines, > even though the existing use of sprintf/scnprintf is functionally safe. > Acked-by: Alexander Usyskin <alexander.usyskin@intel.com> > Signed-off-by: Moon Hee Lee <moonhee.lee.ca@gmail.com> > --- > drivers/misc/mei/bus.c | 17 ++++++++--------- > 1 file changed, 8 insertions(+), 9 deletions(-) > > diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c > index 67176caf5416..bc124a15006e 100644 > --- a/drivers/misc/mei/bus.c > +++ b/drivers/misc/mei/bus.c > @@ -1156,7 +1156,7 @@ static ssize_t name_show(struct device *dev, struct > device_attribute *a, > { > struct mei_cl_device *cldev = to_mei_cl_device(dev); > > - return scnprintf(buf, PAGE_SIZE, "%s", cldev->name); > + return sysfs_emit(buf, "%s", cldev->name); > } > static DEVICE_ATTR_RO(name); > > @@ -1166,7 +1166,7 @@ static ssize_t uuid_show(struct device *dev, struct > device_attribute *a, > struct mei_cl_device *cldev = to_mei_cl_device(dev); > const uuid_le *uuid = mei_me_cl_uuid(cldev->me_cl); > > - return sprintf(buf, "%pUl", uuid); > + return sysfs_emit(buf, "%pUl", uuid); > } > static DEVICE_ATTR_RO(uuid); > > @@ -1176,7 +1176,7 @@ static ssize_t version_show(struct device *dev, > struct device_attribute *a, > struct mei_cl_device *cldev = to_mei_cl_device(dev); > u8 version = mei_me_cl_ver(cldev->me_cl); > > - return sprintf(buf, "%02X", version); > + return sysfs_emit(buf, "%02X", version); > } > static DEVICE_ATTR_RO(version); > > @@ -1187,8 +1187,7 @@ static ssize_t modalias_show(struct device *dev, > struct device_attribute *a, > const uuid_le *uuid = mei_me_cl_uuid(cldev->me_cl); > u8 version = mei_me_cl_ver(cldev->me_cl); > > - return scnprintf(buf, PAGE_SIZE, "mei:%s:%pUl:%02X:", > - cldev->name, uuid, version); > + return sysfs_emit(buf, "mei:%s:%pUl:%02X:", cldev->name, uuid, > version); > } > static DEVICE_ATTR_RO(modalias); > > @@ -1198,7 +1197,7 @@ static ssize_t max_conn_show(struct device *dev, > struct device_attribute *a, > struct mei_cl_device *cldev = to_mei_cl_device(dev); > u8 maxconn = mei_me_cl_max_conn(cldev->me_cl); > > - return sprintf(buf, "%d", maxconn); > + return sysfs_emit(buf, "%d", maxconn); > } > static DEVICE_ATTR_RO(max_conn); > > @@ -1208,7 +1207,7 @@ static ssize_t fixed_show(struct device *dev, struct > device_attribute *a, > struct mei_cl_device *cldev = to_mei_cl_device(dev); > u8 fixed = mei_me_cl_fixed(cldev->me_cl); > > - return sprintf(buf, "%d", fixed); > + return sysfs_emit(buf, "%d", fixed); > } > static DEVICE_ATTR_RO(fixed); > > @@ -1218,7 +1217,7 @@ static ssize_t vtag_show(struct device *dev, struct > device_attribute *a, > struct mei_cl_device *cldev = to_mei_cl_device(dev); > bool vt = mei_me_cl_vt(cldev->me_cl); > > - return sprintf(buf, "%d", vt); > + return sysfs_emit(buf, "%d", vt); > } > static DEVICE_ATTR_RO(vtag); > > @@ -1228,7 +1227,7 @@ static ssize_t max_len_show(struct device *dev, > struct device_attribute *a, > struct mei_cl_device *cldev = to_mei_cl_device(dev); > u32 maxlen = mei_me_cl_max_len(cldev->me_cl); > > - return sprintf(buf, "%u", maxlen); > + return sysfs_emit(buf, "%u", maxlen); > } > static DEVICE_ATTR_RO(max_len); > > -- > 2.43.0
© 2016 - 2025 Red Hat, Inc.