Skip to content

Commit

Permalink
thermal: move from strlcpy() with unused retval to strscpy()
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Wolfram Sang authored and Rafael J. Wysocki committed Aug 31, 2022
1 parent 72c976f commit 1e6c8fb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion drivers/thermal/thermal_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1219,7 +1219,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)
Expand Down
2 changes: 1 addition & 1 deletion drivers/thermal/thermal_hwmon.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 1e6c8fb

Please sign in to comment.