thermal: move from strlcpy() with unused retval to strscpy()

Wolfram Sang · rafaeljw · commit 1e6c8fb8b8d3 · 2022-08-31T21:13:35.000+02:00
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>
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
@@ -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)
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -1219,7 +1219,7 @@ thermal_zone_device_register_with_trips(const char type, struct thermal_trip t`
`1219`	`1219`	`}`
`1220`	`1220`
`1221`	`1221`	`tz->id = id;`
`1222`		`- strlcpy(tz->type, type, sizeof(tz->type));`
	`1222`	`+ strscpy(tz->type, type, sizeof(tz->type));`
`1223`	`1223`
`1224`	`1224`	`result = dev_set_name(&tz->device, "thermal_zone%d", tz->id);`
`1225`	`1225`	`if (result)`