| Message ID | 20220818210111.7445-1-wsa+renesas@sang-engineering.com |
|---|---|
| State | Accepted |
| Commit | 1e6c8fb8b8d3e91e140b505e8a68b05f81ac0f87 |
| Headers | show |
| Series | thermal: move from strlcpy with unused retval to strscpy | expand |
On Thu, Aug 18, 2022 at 11:03 PM Wolfram Sang <wsa+renesas@sang-engineering.com> wrote: > > Follow the advice of the below link and prefer 'strscpy' in this > subsystem. Conversion is 1:1 because the return value is not used. > Generated by a coccinelle script. > > Link: https://lore.kernel.org/r/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL=V6A6G1oUZcprmknw@mail.gmail.com/ > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > --- > drivers/thermal/thermal_core.c | 2 +- > drivers/thermal/thermal_hwmon.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c > index 6a5d0ae5d7a4..0d1dae4ed7f6 100644 > --- a/drivers/thermal/thermal_core.c > +++ b/drivers/thermal/thermal_core.c > @@ -1239,7 +1239,7 @@ thermal_zone_device_register_with_trips(const char *type, struct thermal_trip *t > } > > tz->id = id; > - strlcpy(tz->type, type, sizeof(tz->type)); > + strscpy(tz->type, type, sizeof(tz->type)); > > result = dev_set_name(&tz->device, "thermal_zone%d", tz->id); > if (result) > diff --git a/drivers/thermal/thermal_hwmon.c b/drivers/thermal/thermal_hwmon.c > index 09e49ec8b6f4..f53f4ceb6a5d 100644 > --- a/drivers/thermal/thermal_hwmon.c > +++ b/drivers/thermal/thermal_hwmon.c > @@ -147,7 +147,7 @@ int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz) > return -ENOMEM; > > INIT_LIST_HEAD(&hwmon->tz_list); > - strlcpy(hwmon->type, tz->type, THERMAL_NAME_LENGTH); > + strscpy(hwmon->type, tz->type, THERMAL_NAME_LENGTH); > strreplace(hwmon->type, '-', '_'); > hwmon->device = hwmon_device_register_for_thermal(&tz->device, > hwmon->type, hwmon); > -- Applied as 6.1 material, thanks!
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 6a5d0ae5d7a4..0d1dae4ed7f6 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -1239,7 +1239,7 @@ thermal_zone_device_register_with_trips(const char *type, struct thermal_trip *t } tz->id = id; - strlcpy(tz->type, type, sizeof(tz->type)); + strscpy(tz->type, type, sizeof(tz->type)); result = dev_set_name(&tz->device, "thermal_zone%d", tz->id); if (result) diff --git a/drivers/thermal/thermal_hwmon.c b/drivers/thermal/thermal_hwmon.c index 09e49ec8b6f4..f53f4ceb6a5d 100644 --- a/drivers/thermal/thermal_hwmon.c +++ b/drivers/thermal/thermal_hwmon.c @@ -147,7 +147,7 @@ int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz) return -ENOMEM; INIT_LIST_HEAD(&hwmon->tz_list); - strlcpy(hwmon->type, tz->type, THERMAL_NAME_LENGTH); + strscpy(hwmon->type, tz->type, THERMAL_NAME_LENGTH); strreplace(hwmon->type, '-', '_'); hwmon->device = hwmon_device_register_for_thermal(&tz->device, hwmon->type, hwmon);
Follow the advice of the below link and prefer 'strscpy' in this subsystem. Conversion is 1:1 because the return value is not used. Generated by a coccinelle script. Link: https://lore.kernel.org/r/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL=V6A6G1oUZcprmknw@mail.gmail.com/ Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> --- drivers/thermal/thermal_core.c | 2 +- drivers/thermal/thermal_hwmon.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)