diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-02-21 16:37:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-02-21 17:09:51 -0800 |
| commit | bf4afc53b77aeaa48b5409da5c8da6bb4eff7f43 (patch) | |
| tree | 01fdd9d27f1b272bef0127966e08eac44d134d0a /drivers/powercap | |
| parent | e19e1b480ac73c3e62ffebbca1174f0f511f43e7 (diff) | |
Convert 'alloc_obj' family to use the new default GFP_KERNEL argument
This was done entirely with mindless brute force, using
git grep -l '\<k[vmz]*alloc_objs*(.*, GFP_KERNEL)' |
xargs sed -i 's/\(alloc_objs*(.*\), GFP_KERNEL)/\1)/'
to convert the new alloc_obj() users that had a simple GFP_KERNEL
argument to just drop that argument.
Note that due to the extreme simplicity of the scripting, any slightly
more complex cases spread over multiple lines would not be triggered:
they definitely exist, but this covers the vast bulk of the cases, and
the resulting diff is also then easier to check automatically.
For the same reason the 'flex' versions will be done as a separate
conversion.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/powercap')
| -rw-r--r-- | drivers/powercap/arm_scmi_powercap.c | 2 | ||||
| -rw-r--r-- | drivers/powercap/dtpm.c | 2 | ||||
| -rw-r--r-- | drivers/powercap/dtpm_cpu.c | 2 | ||||
| -rw-r--r-- | drivers/powercap/dtpm_devfreq.c | 2 | ||||
| -rw-r--r-- | drivers/powercap/intel_rapl_common.c | 2 | ||||
| -rw-r--r-- | drivers/powercap/intel_rapl_tpmi.c | 2 | ||||
| -rw-r--r-- | drivers/powercap/powercap_sys.c | 4 |
7 files changed, 8 insertions, 8 deletions
diff --git a/drivers/powercap/arm_scmi_powercap.c b/drivers/powercap/arm_scmi_powercap.c index 798c43e482ae..ab66e9a3b1e2 100644 --- a/drivers/powercap/arm_scmi_powercap.c +++ b/drivers/powercap/arm_scmi_powercap.c @@ -370,7 +370,7 @@ static int scmi_zones_register(struct device *dev, unsigned int sp = 0, reg_zones = 0; struct scmi_powercap_zone *spz, **zones_stack; - zones_stack = kzalloc_objs(spz, pr->num_zones, GFP_KERNEL); + zones_stack = kzalloc_objs(spz, pr->num_zones); if (!zones_stack) return -ENOMEM; diff --git a/drivers/powercap/dtpm.c b/drivers/powercap/dtpm.c index afdeecef69ef..b7a65e543f19 100644 --- a/drivers/powercap/dtpm.c +++ b/drivers/powercap/dtpm.c @@ -418,7 +418,7 @@ static struct dtpm *dtpm_setup_virtual(const struct dtpm_node *hierarchy, struct dtpm *dtpm; int ret; - dtpm = kzalloc_obj(*dtpm, GFP_KERNEL); + dtpm = kzalloc_obj(*dtpm); if (!dtpm) return ERR_PTR(-ENOMEM); dtpm_init(dtpm, NULL); diff --git a/drivers/powercap/dtpm_cpu.c b/drivers/powercap/dtpm_cpu.c index 25489b3b03be..21355db6419d 100644 --- a/drivers/powercap/dtpm_cpu.c +++ b/drivers/powercap/dtpm_cpu.c @@ -212,7 +212,7 @@ static int __dtpm_cpu_setup(int cpu, struct dtpm *parent) goto release_policy; } - dtpm_cpu = kzalloc_obj(*dtpm_cpu, GFP_KERNEL); + dtpm_cpu = kzalloc_obj(*dtpm_cpu); if (!dtpm_cpu) { ret = -ENOMEM; goto release_policy; diff --git a/drivers/powercap/dtpm_devfreq.c b/drivers/powercap/dtpm_devfreq.c index e941bb241986..fa71285dee60 100644 --- a/drivers/powercap/dtpm_devfreq.c +++ b/drivers/powercap/dtpm_devfreq.c @@ -160,7 +160,7 @@ static int __dtpm_devfreq_setup(struct devfreq *devfreq, struct dtpm *parent) } } - dtpm_devfreq = kzalloc_obj(*dtpm_devfreq, GFP_KERNEL); + dtpm_devfreq = kzalloc_obj(*dtpm_devfreq); if (!dtpm_devfreq) return -ENOMEM; diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c index e7f538ebab2f..4d5b12ba0eff 100644 --- a/drivers/powercap/intel_rapl_common.c +++ b/drivers/powercap/intel_rapl_common.c @@ -2216,7 +2216,7 @@ struct rapl_package *rapl_add_package_cpuslocked(int id, struct rapl_if_priv *pr struct rapl_package *rp; int ret; - rp = kzalloc_obj(struct rapl_package, GFP_KERNEL); + rp = kzalloc_obj(struct rapl_package); if (!rp) return ERR_PTR(-ENOMEM); diff --git a/drivers/powercap/intel_rapl_tpmi.c b/drivers/powercap/intel_rapl_tpmi.c index f68784c7e718..ba956a2571d1 100644 --- a/drivers/powercap/intel_rapl_tpmi.c +++ b/drivers/powercap/intel_rapl_tpmi.c @@ -102,7 +102,7 @@ static struct tpmi_rapl_package *trp_alloc(int pkg_id) } } - trp = kzalloc_obj(*trp, GFP_KERNEL); + trp = kzalloc_obj(*trp); if (!trp) { ret = -ENOMEM; goto err_del_powercap; diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c index b32ac11a6c49..b65bb4f4b92a 100644 --- a/drivers/powercap/powercap_sys.c +++ b/drivers/powercap/powercap_sys.c @@ -501,7 +501,7 @@ struct powercap_zone *powercap_register_zone( return ERR_PTR(-EINVAL); memset(power_zone, 0, sizeof(*power_zone)); } else { - power_zone = kzalloc_obj(*power_zone, GFP_KERNEL); + power_zone = kzalloc_obj(*power_zone); if (!power_zone) return ERR_PTR(-ENOMEM); power_zone->allocated = true; @@ -613,7 +613,7 @@ struct powercap_control_type *powercap_register_control_type( return ERR_PTR(-EINVAL); memset(control_type, 0, sizeof(*control_type)); } else { - control_type = kzalloc_obj(*control_type, GFP_KERNEL); + control_type = kzalloc_obj(*control_type); if (!control_type) return ERR_PTR(-ENOMEM); control_type->allocated = true; |
