diff options
| author | Kees Cook <kees@kernel.org> | 2026-02-21 23:46:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-02-22 08:26:33 -0800 |
| commit | 189f164e573e18d9f8876dbd3ad8fcbe11f93037 (patch) | |
| tree | 733382723a15ea29b7c9f3dde3bcb281f0b3c287 /drivers/thermal | |
| parent | 32a92f8c89326985e05dce8b22d3f0aa07a3e1bd (diff) | |
Convert remaining multi-line kmalloc_obj/flex GFP_KERNEL usesHEADtorvalds/mastertorvalds/HEADmaster
Conversion performed via this Coccinelle script:
// SPDX-License-Identifier: GPL-2.0-only
// Options: --include-headers-for-types --all-includes --include-headers --keep-comments
virtual patch
@gfp depends on patch && !(file in "tools") && !(file in "samples")@
identifier ALLOC = {kmalloc_obj,kmalloc_objs,kmalloc_flex,
kzalloc_obj,kzalloc_objs,kzalloc_flex,
kvmalloc_obj,kvmalloc_objs,kvmalloc_flex,
kvzalloc_obj,kvzalloc_objs,kvzalloc_flex};
@@
ALLOC(...
- , GFP_KERNEL
)
$ make coccicheck MODE=patch COCCI=gfp.cocci
Build and boot tested x86_64 with Fedora 42's GCC and Clang:
Linux version 6.19.0+ (user@host) (gcc (GCC) 15.2.1 20260123 (Red Hat 15.2.1-7), GNU ld version 2.44-12.fc42) #1 SMP PREEMPT_DYNAMIC 1970-01-01
Linux version 6.19.0+ (user@host) (clang version 20.1.8 (Fedora 20.1.8-4.fc42), LLD 20.1.8) #1 SMP PREEMPT_DYNAMIC 1970-01-01
Signed-off-by: Kees Cook <kees@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/thermal')
| -rw-r--r-- | drivers/thermal/cpufreq_cooling.c | 2 | ||||
| -rw-r--r-- | drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 2 | ||||
| -rw-r--r-- | drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c | 3 | ||||
| -rw-r--r-- | drivers/thermal/testing/zone.c | 3 |
4 files changed, 4 insertions, 6 deletions
diff --git a/drivers/thermal/cpufreq_cooling.c b/drivers/thermal/cpufreq_cooling.c index 3b85f077c364..32bf5ab44f4a 100644 --- a/drivers/thermal/cpufreq_cooling.c +++ b/drivers/thermal/cpufreq_cooling.c @@ -372,7 +372,7 @@ static int allocate_idle_time(struct cpufreq_cooling_device *cpufreq_cdev) unsigned int num_cpus = cpumask_weight(cpufreq_cdev->policy->related_cpus); cpufreq_cdev->idle_time = kzalloc_objs(*cpufreq_cdev->idle_time, - num_cpus, GFP_KERNEL); + num_cpus); if (!cpufreq_cdev->idle_time) return -ENOMEM; diff --git a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c index 6742eaf0a447..d200734625ee 100644 --- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c @@ -391,7 +391,7 @@ static int evaluate_odvp(struct int3400_thermal_priv *priv) if (priv->odvp_attrs == NULL) { priv->odvp_attrs = kzalloc_objs(struct odvp_attr, - priv->odvp_count, GFP_KERNEL); + priv->odvp_count); if (!priv->odvp_attrs) { ret = -ENOMEM; goto out_err; diff --git a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c index 4c8888fb0a8b..965700ee6962 100644 --- a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c +++ b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c @@ -134,8 +134,7 @@ struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev, int34x_zone->aux_trip_nr = trip_cnt; zone_trips = kzalloc_objs(*zone_trips, - trip_cnt + INT340X_THERMAL_MAX_TRIP_COUNT, - GFP_KERNEL); + trip_cnt + INT340X_THERMAL_MAX_TRIP_COUNT); if (!zone_trips) { ret = -ENOMEM; goto err_trips_alloc; diff --git a/drivers/thermal/testing/zone.c b/drivers/thermal/testing/zone.c index 7af160ceb634..3c339242f52d 100644 --- a/drivers/thermal/testing/zone.c +++ b/drivers/thermal/testing/zone.c @@ -391,8 +391,7 @@ static int tt_zone_register_tz(struct tt_thermal_zone *tt_zone) return -EINVAL; struct thermal_trip *trips __free(kfree) = kzalloc_objs(*trips, - tt_zone->num_trips, - GFP_KERNEL); + tt_zone->num_trips); if (!trips) return -ENOMEM; |