Skip to content

Commit b4b1ddc

Browse files
leesagaciousvireshk
leesagacious
authored and
vireshk
committed
cpufreq: Make cpufreq_driver->exit() return void
The cpufreq core doesn't check the return type of the exit() callback and there is not much the core can do on failures at that point. Just drop the returned value and make it return void. Signed-off-by: Lizhe <[email protected]> [ Viresh: Reworked the patches to fix all missing changes together. ] Signed-off-by: Viresh Kumar <[email protected]> Reviewed-by: AngeloGioacchino Del Regno <[email protected]> # Mediatek Acked-by: Sudeep Holla <[email protected]> # scpi, scmi, vexpress Acked-by: Mario Limonciello <[email protected]> # amd Reviewed-by: Florian Fainelli <[email protected]> # bmips Acked-by: Rafael J. Wysocki <[email protected]> Acked-by: Kevin Hilman <[email protected]> # omap
1 parent dfd3e8b commit b4b1ddc

28 files changed

+37
-84
lines changed

‎drivers/cpufreq/acpi-cpufreq.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -906,7 +906,7 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
906906
return result;
907907
}
908908

909-
static int acpi_cpufreq_cpu_exit(struct cpufreq_policy *policy)
909+
static void acpi_cpufreq_cpu_exit(struct cpufreq_policy *policy)
910910
{
911911
struct acpi_cpufreq_data *data = policy->driver_data;
912912

@@ -919,8 +919,6 @@ static int acpi_cpufreq_cpu_exit(struct cpufreq_policy *policy)
919919
free_cpumask_var(data->freqdomain_cpus);
920920
kfree(policy->freq_table);
921921
kfree(data);
922-
923-
return 0;
924922
}
925923

926924
static int acpi_cpufreq_resume(struct cpufreq_policy *policy)

‎drivers/cpufreq/amd-pstate.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -983,16 +983,14 @@ static int amd_pstate_cpu_init(struct cpufreq_policy *policy)
983983
return ret;
984984
}
985985

986-
static int amd_pstate_cpu_exit(struct cpufreq_policy *policy)
986+
static void amd_pstate_cpu_exit(struct cpufreq_policy *policy)
987987
{
988988
struct amd_cpudata *cpudata = policy->driver_data;
989989

990990
freq_qos_remove_request(&cpudata->req[1]);
991991
freq_qos_remove_request(&cpudata->req[0]);
992992
policy->fast_switch_possible = false;
993993
kfree(cpudata);
994-
995-
return 0;
996994
}
997995

998996
static int amd_pstate_cpu_resume(struct cpufreq_policy *policy)
@@ -1439,7 +1437,7 @@ static int amd_pstate_epp_cpu_init(struct cpufreq_policy *policy)
14391437
return ret;
14401438
}
14411439

1442-
static int amd_pstate_epp_cpu_exit(struct cpufreq_policy *policy)
1440+
static void amd_pstate_epp_cpu_exit(struct cpufreq_policy *policy)
14431441
{
14441442
struct amd_cpudata *cpudata = policy->driver_data;
14451443

@@ -1449,7 +1447,6 @@ static int amd_pstate_epp_cpu_exit(struct cpufreq_policy *policy)
14491447
}
14501448

14511449
pr_debug("CPU %d exiting\n", policy->cpu);
1452-
return 0;
14531450
}
14541451

14551452
static void amd_pstate_epp_update_limit(struct cpufreq_policy *policy)

‎drivers/cpufreq/apple-soc-cpufreq.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,16 +305,14 @@ static int apple_soc_cpufreq_init(struct cpufreq_policy *policy)
305305
return ret;
306306
}
307307

308-
static int apple_soc_cpufreq_exit(struct cpufreq_policy *policy)
308+
static void apple_soc_cpufreq_exit(struct cpufreq_policy *policy)
309309
{
310310
struct apple_cpu_priv *priv = policy->driver_data;
311311

312312
dev_pm_opp_free_cpufreq_table(priv->cpu_dev, &policy->freq_table);
313313
dev_pm_opp_remove_all_dynamic(priv->cpu_dev);
314314
iounmap(priv->reg_base);
315315
kfree(priv);
316-
317-
return 0;
318316
}
319317

320318
static struct cpufreq_driver apple_soc_cpufreq_driver = {

‎drivers/cpufreq/bmips-cpufreq.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,9 @@ static int bmips_cpufreq_target_index(struct cpufreq_policy *policy,
121121
return 0;
122122
}
123123

124-
static int bmips_cpufreq_exit(struct cpufreq_policy *policy)
124+
static void bmips_cpufreq_exit(struct cpufreq_policy *policy)
125125
{
126126
kfree(policy->freq_table);
127-
128-
return 0;
129127
}
130128

131129
static int bmips_cpufreq_init(struct cpufreq_policy *policy)

‎drivers/cpufreq/cppc_cpufreq.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy)
683683
return ret;
684684
}
685685

686-
static int cppc_cpufreq_cpu_exit(struct cpufreq_policy *policy)
686+
static void cppc_cpufreq_cpu_exit(struct cpufreq_policy *policy)
687687
{
688688
struct cppc_cpudata *cpu_data = policy->driver_data;
689689
struct cppc_perf_caps *caps = &cpu_data->perf_caps;
@@ -700,7 +700,6 @@ static int cppc_cpufreq_cpu_exit(struct cpufreq_policy *policy)
700700
caps->lowest_perf, cpu, ret);
701701

702702
cppc_cpufreq_put_cpu_data(policy);
703-
return 0;
704703
}
705704

706705
static inline u64 get_delta(u64 t1, u64 t0)

‎drivers/cpufreq/cpufreq-dt.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,9 @@ static int cpufreq_offline(struct cpufreq_policy *policy)
157157
return 0;
158158
}
159159

160-
static int cpufreq_exit(struct cpufreq_policy *policy)
160+
static void cpufreq_exit(struct cpufreq_policy *policy)
161161
{
162162
clk_put(policy->clk);
163-
return 0;
164163
}
165164

166165
static struct cpufreq_driver dt_cpufreq_driver = {

‎drivers/cpufreq/e_powersaver.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -360,14 +360,13 @@ static int eps_cpu_init(struct cpufreq_policy *policy)
360360
return 0;
361361
}
362362

363-
static int eps_cpu_exit(struct cpufreq_policy *policy)
363+
static void eps_cpu_exit(struct cpufreq_policy *policy)
364364
{
365365
unsigned int cpu = policy->cpu;
366366

367367
/* Bye */
368368
kfree(eps_cpu[cpu]);
369369
eps_cpu[cpu] = NULL;
370-
return 0;
371370
}
372371

373372
static struct cpufreq_driver eps_driver = {

‎drivers/cpufreq/intel_pstate.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2694,13 +2694,11 @@ static int intel_pstate_cpu_offline(struct cpufreq_policy *policy)
26942694
return intel_cpufreq_cpu_offline(policy);
26952695
}
26962696

2697-
static int intel_pstate_cpu_exit(struct cpufreq_policy *policy)
2697+
static void intel_pstate_cpu_exit(struct cpufreq_policy *policy)
26982698
{
26992699
pr_debug("CPU %d exiting\n", policy->cpu);
27002700

27012701
policy->fast_switch_possible = false;
2702-
2703-
return 0;
27042702
}
27052703

27062704
static int __intel_pstate_cpu_init(struct cpufreq_policy *policy)
@@ -3031,7 +3029,7 @@ static int intel_cpufreq_cpu_init(struct cpufreq_policy *policy)
30313029
return ret;
30323030
}
30333031

3034-
static int intel_cpufreq_cpu_exit(struct cpufreq_policy *policy)
3032+
static void intel_cpufreq_cpu_exit(struct cpufreq_policy *policy)
30353033
{
30363034
struct freq_qos_request *req;
30373035

@@ -3041,7 +3039,7 @@ static int intel_cpufreq_cpu_exit(struct cpufreq_policy *policy)
30413039
freq_qos_remove_request(req);
30423040
kfree(req);
30433041

3044-
return intel_pstate_cpu_exit(policy);
3042+
intel_pstate_cpu_exit(policy);
30453043
}
30463044

30473045
static int intel_cpufreq_suspend(struct cpufreq_policy *policy)

‎drivers/cpufreq/mediatek-cpufreq-hw.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ static int mtk_cpufreq_hw_cpu_init(struct cpufreq_policy *policy)
260260
return 0;
261261
}
262262

263-
static int mtk_cpufreq_hw_cpu_exit(struct cpufreq_policy *policy)
263+
static void mtk_cpufreq_hw_cpu_exit(struct cpufreq_policy *policy)
264264
{
265265
struct mtk_cpufreq_data *data = policy->driver_data;
266266
struct resource *res = data->res;
@@ -270,8 +270,6 @@ static int mtk_cpufreq_hw_cpu_exit(struct cpufreq_policy *policy)
270270
writel_relaxed(0x0, data->reg_bases[REG_FREQ_ENABLE]);
271271
iounmap(base);
272272
release_mem_region(res->start, resource_size(res));
273-
274-
return 0;
275273
}
276274

277275
static void mtk_cpufreq_register_em(struct cpufreq_policy *policy)

‎drivers/cpufreq/mediatek-cpufreq.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -599,13 +599,11 @@ static int mtk_cpufreq_init(struct cpufreq_policy *policy)
599599
return 0;
600600
}
601601

602-
static int mtk_cpufreq_exit(struct cpufreq_policy *policy)
602+
static void mtk_cpufreq_exit(struct cpufreq_policy *policy)
603603
{
604604
struct mtk_cpu_dvfs_info *info = policy->driver_data;
605605

606606
dev_pm_opp_free_cpufreq_table(info->cpu_dev, &policy->freq_table);
607-
608-
return 0;
609607
}
610608

611609
static struct cpufreq_driver mtk_cpufreq_driver = {

‎drivers/cpufreq/omap-cpufreq.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,10 @@ static int omap_cpu_init(struct cpufreq_policy *policy)
135135
return 0;
136136
}
137137

138-
static int omap_cpu_exit(struct cpufreq_policy *policy)
138+
static void omap_cpu_exit(struct cpufreq_policy *policy)
139139
{
140140
freq_table_free();
141141
clk_put(policy->clk);
142-
return 0;
143142
}
144143

145144
static struct cpufreq_driver omap_driver = {

‎drivers/cpufreq/pasemi-cpufreq.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,21 +204,19 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy)
204204
return err;
205205
}
206206

207-
static int pas_cpufreq_cpu_exit(struct cpufreq_policy *policy)
207+
static void pas_cpufreq_cpu_exit(struct cpufreq_policy *policy)
208208
{
209209
/*
210210
* We don't support CPU hotplug. Don't unmap after the system
211211
* has already made it to a running state.
212212
*/
213213
if (system_state >= SYSTEM_RUNNING)
214-
return 0;
214+
return;
215215

216216
if (sdcasr_mapbase)
217217
iounmap(sdcasr_mapbase);
218218
if (sdcpwr_mapbase)
219219
iounmap(sdcpwr_mapbase);
220-
221-
return 0;
222220
}
223221

224222
static int pas_cpufreq_target(struct cpufreq_policy *policy,

‎drivers/cpufreq/powernow-k6.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ static int powernow_k6_cpu_init(struct cpufreq_policy *policy)
219219
}
220220

221221

222-
static int powernow_k6_cpu_exit(struct cpufreq_policy *policy)
222+
static void powernow_k6_cpu_exit(struct cpufreq_policy *policy)
223223
{
224224
unsigned int i;
225225

@@ -234,10 +234,9 @@ static int powernow_k6_cpu_exit(struct cpufreq_policy *policy)
234234
cpufreq_freq_transition_begin(policy, &freqs);
235235
powernow_k6_target(policy, i);
236236
cpufreq_freq_transition_end(policy, &freqs, 0);
237-
break;
237+
return;
238238
}
239239
}
240-
return 0;
241240
}
242241

243242
static unsigned int powernow_k6_get(unsigned int cpu)

‎drivers/cpufreq/powernow-k7.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ static int powernow_cpu_init(struct cpufreq_policy *policy)
644644
return 0;
645645
}
646646

647-
static int powernow_cpu_exit(struct cpufreq_policy *policy)
647+
static void powernow_cpu_exit(struct cpufreq_policy *policy)
648648
{
649649
#ifdef CONFIG_X86_POWERNOW_K7_ACPI
650650
if (acpi_processor_perf) {
@@ -655,7 +655,6 @@ static int powernow_cpu_exit(struct cpufreq_policy *policy)
655655
#endif
656656

657657
kfree(powernow_table);
658-
return 0;
659658
}
660659

661660
static struct cpufreq_driver powernow_driver = {

‎drivers/cpufreq/powernow-k8.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1089,13 +1089,13 @@ static int powernowk8_cpu_init(struct cpufreq_policy *pol)
10891089
return -ENODEV;
10901090
}
10911091

1092-
static int powernowk8_cpu_exit(struct cpufreq_policy *pol)
1092+
static void powernowk8_cpu_exit(struct cpufreq_policy *pol)
10931093
{
10941094
struct powernow_k8_data *data = per_cpu(powernow_data, pol->cpu);
10951095
int cpu;
10961096

10971097
if (!data)
1098-
return -EINVAL;
1098+
return;
10991099

11001100
powernow_k8_cpu_exit_acpi(data);
11011101

@@ -1104,8 +1104,6 @@ static int powernowk8_cpu_exit(struct cpufreq_policy *pol)
11041104
/* pol->cpus will be empty here, use related_cpus instead. */
11051105
for_each_cpu(cpu, pol->related_cpus)
11061106
per_cpu(powernow_data, cpu) = NULL;
1107-
1108-
return 0;
11091107
}
11101108

11111109
static void query_values_on_cpu(void *_err)

‎drivers/cpufreq/powernv-cpufreq.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -874,7 +874,7 @@ static int powernv_cpufreq_cpu_init(struct cpufreq_policy *policy)
874874
return 0;
875875
}
876876

877-
static int powernv_cpufreq_cpu_exit(struct cpufreq_policy *policy)
877+
static void powernv_cpufreq_cpu_exit(struct cpufreq_policy *policy)
878878
{
879879
struct powernv_smp_call_data freq_data;
880880
struct global_pstate_info *gpstates = policy->driver_data;
@@ -886,8 +886,6 @@ static int powernv_cpufreq_cpu_exit(struct cpufreq_policy *policy)
886886
del_timer_sync(&gpstates->timer);
887887

888888
kfree(policy->driver_data);
889-
890-
return 0;
891889
}
892890

893891
static int powernv_cpufreq_reboot_notifier(struct notifier_block *nb,

‎drivers/cpufreq/ppc_cbe_cpufreq.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,9 @@ static int cbe_cpufreq_cpu_init(struct cpufreq_policy *policy)
113113
return 0;
114114
}
115115

116-
static int cbe_cpufreq_cpu_exit(struct cpufreq_policy *policy)
116+
static void cbe_cpufreq_cpu_exit(struct cpufreq_policy *policy)
117117
{
118118
cbe_cpufreq_pmi_policy_exit(policy);
119-
return 0;
120119
}
121120

122121
static int cbe_cpufreq_target(struct cpufreq_policy *policy,

‎drivers/cpufreq/qcom-cpufreq-hw.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ static int qcom_cpufreq_hw_cpu_init(struct cpufreq_policy *policy)
573573
return qcom_cpufreq_hw_lmh_init(policy, index);
574574
}
575575

576-
static int qcom_cpufreq_hw_cpu_exit(struct cpufreq_policy *policy)
576+
static void qcom_cpufreq_hw_cpu_exit(struct cpufreq_policy *policy)
577577
{
578578
struct device *cpu_dev = get_cpu_device(policy->cpu);
579579
struct qcom_cpufreq_data *data = policy->driver_data;
@@ -583,8 +583,6 @@ static int qcom_cpufreq_hw_cpu_exit(struct cpufreq_policy *policy)
583583
qcom_cpufreq_hw_lmh_exit(data);
584584
kfree(policy->freq_table);
585585
kfree(data);
586-
587-
return 0;
588586
}
589587

590588
static void qcom_cpufreq_ready(struct cpufreq_policy *policy)

‎drivers/cpufreq/qoriq-cpufreq.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,16 +225,14 @@ static int qoriq_cpufreq_cpu_init(struct cpufreq_policy *policy)
225225
return -ENODEV;
226226
}
227227

228-
static int qoriq_cpufreq_cpu_exit(struct cpufreq_policy *policy)
228+
static void qoriq_cpufreq_cpu_exit(struct cpufreq_policy *policy)
229229
{
230230
struct cpu_data *data = policy->driver_data;
231231

232232
kfree(data->pclk);
233233
kfree(data->table);
234234
kfree(data);
235235
policy->driver_data = NULL;
236-
237-
return 0;
238236
}
239237

240238
static int qoriq_cpufreq_target(struct cpufreq_policy *policy,

‎drivers/cpufreq/scmi-cpufreq.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -308,16 +308,14 @@ static int scmi_cpufreq_init(struct cpufreq_policy *policy)
308308
return ret;
309309
}
310310

311-
static int scmi_cpufreq_exit(struct cpufreq_policy *policy)
311+
static void scmi_cpufreq_exit(struct cpufreq_policy *policy)
312312
{
313313
struct scmi_data *priv = policy->driver_data;
314314

315315
dev_pm_opp_free_cpufreq_table(priv->cpu_dev, &policy->freq_table);
316316
dev_pm_opp_remove_all_dynamic(priv->cpu_dev);
317317
free_cpumask_var(priv->opp_shared_cpus);
318318
kfree(priv);
319-
320-
return 0;
321319
}
322320

323321
static void scmi_cpufreq_register_em(struct cpufreq_policy *policy)

‎drivers/cpufreq/scpi-cpufreq.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,16 +167,14 @@ static int scpi_cpufreq_init(struct cpufreq_policy *policy)
167167
return ret;
168168
}
169169

170-
static int scpi_cpufreq_exit(struct cpufreq_policy *policy)
170+
static void scpi_cpufreq_exit(struct cpufreq_policy *policy)
171171
{
172172
struct scpi_data *priv = policy->driver_data;
173173

174174
clk_put(priv->clk);
175175
dev_pm_opp_free_cpufreq_table(priv->cpu_dev, &policy->freq_table);
176176
dev_pm_opp_remove_all_dynamic(priv->cpu_dev);
177177
kfree(priv);
178-
179-
return 0;
180178
}
181179

182180
static struct cpufreq_driver scpi_cpufreq_driver = {

0 commit comments

Comments
 (0)