Skip to content

Commit fbd401e

Browse files
committed
ACPI: processor: idle: Redefine two functions as void
Notice that acpi_processor_power_init() and acpi_processor_power_exit() don't need to return any values because their callers don't check them anyway, so redefine those functions as void. While at it, rearrange the code in acpi_processor_power_init() to reduce the indentation level, get rid of a redundant local variable in that function, and rephrase a code comment in it. No intentional functional impact. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Reviewed-by: Mario Limonciello (AMD) <superm1@kernel.org>
1 parent 8a1b5d4 commit fbd401e

File tree

2 files changed

+21
-24
lines changed

2 files changed

+21
-24
lines changed

drivers/acpi/processor_idle.c

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1400,55 +1400,52 @@ void acpi_processor_unregister_idle_driver(void)
14001400
cpuidle_unregister_driver(&acpi_idle_driver);
14011401
}
14021402

1403-
int acpi_processor_power_init(struct acpi_processor *pr)
1403+
void acpi_processor_power_init(struct acpi_processor *pr)
14041404
{
1405-
int retval;
14061405
struct cpuidle_device *dev;
14071406

14081407
if (disabled_by_idle_boot_param())
1409-
return 0;
1408+
return;
14101409

14111410
acpi_processor_cstate_first_run_checks();
14121411

14131412
if (!acpi_processor_get_power_info(pr))
14141413
pr->flags.power_setup_done = 1;
14151414

1416-
if (pr->flags.power) {
1417-
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
1418-
if (!dev)
1419-
return -ENOMEM;
1420-
per_cpu(acpi_cpuidle_device, pr->id) = dev;
1415+
if (!pr->flags.power)
1416+
return;
14211417

1422-
acpi_processor_setup_cpuidle_dev(pr, dev);
1418+
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
1419+
if (!dev)
1420+
return;
14231421

1424-
/* Register per-cpu cpuidle_device. Cpuidle driver
1425-
* must already be registered before registering device
1426-
*/
1427-
retval = cpuidle_register_device(dev);
1428-
if (retval) {
1422+
per_cpu(acpi_cpuidle_device, pr->id) = dev;
14291423

1430-
per_cpu(acpi_cpuidle_device, pr->id) = NULL;
1431-
kfree(dev);
1432-
return retval;
1433-
}
1424+
acpi_processor_setup_cpuidle_dev(pr, dev);
1425+
1426+
/*
1427+
* Register a cpuidle device for this CPU. The cpuidle driver using
1428+
* this device is expected to be registered.
1429+
*/
1430+
if (cpuidle_register_device(dev)) {
1431+
per_cpu(acpi_cpuidle_device, pr->id) = NULL;
1432+
kfree(dev);
14341433
}
1435-
return 0;
14361434
}
14371435

1438-
int acpi_processor_power_exit(struct acpi_processor *pr)
1436+
void acpi_processor_power_exit(struct acpi_processor *pr)
14391437
{
14401438
struct cpuidle_device *dev = per_cpu(acpi_cpuidle_device, pr->id);
14411439

14421440
if (disabled_by_idle_boot_param())
1443-
return 0;
1441+
return;
14441442

14451443
if (pr->flags.power) {
14461444
cpuidle_unregister_device(dev);
14471445
kfree(dev);
14481446
}
14491447

14501448
pr->flags.power_setup_done = 0;
1451-
return 0;
14521449
}
14531450

14541451
MODULE_IMPORT_NS("ACPI_PROCESSOR_IDLE");

include/acpi/processor.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -419,8 +419,8 @@ static inline void acpi_processor_throttling_init(void) {}
419419
/* in processor_idle.c */
420420
extern struct cpuidle_driver acpi_idle_driver;
421421
#ifdef CONFIG_ACPI_PROCESSOR_IDLE
422-
int acpi_processor_power_init(struct acpi_processor *pr);
423-
int acpi_processor_power_exit(struct acpi_processor *pr);
422+
void acpi_processor_power_init(struct acpi_processor *pr);
423+
void acpi_processor_power_exit(struct acpi_processor *pr);
424424
int acpi_processor_power_state_has_changed(struct acpi_processor *pr);
425425
int acpi_processor_hotplug(struct acpi_processor *pr);
426426
void acpi_processor_register_idle_driver(void);

0 commit comments

Comments
 (0)