Skip to content

Commit 31612f3

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> Tested-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://patch.msgid.link/20251223100914.2407069-5-lihuisong@huawei.com Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 0089ce1 commit 31612f3

2 files changed

Lines changed: 21 additions & 24 deletions

File tree

drivers/acpi/processor_idle.c

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1391,55 +1391,52 @@ void acpi_processor_unregister_idle_driver(void)
13911391
cpuidle_unregister_driver(&acpi_idle_driver);
13921392
}
13931393

1394-
int acpi_processor_power_init(struct acpi_processor *pr)
1394+
void acpi_processor_power_init(struct acpi_processor *pr)
13951395
{
1396-
int retval;
13971396
struct cpuidle_device *dev;
13981397

13991398
if (disabled_by_idle_boot_param())
1400-
return 0;
1399+
return;
14011400

14021401
acpi_processor_cstate_first_run_checks();
14031402

14041403
if (!acpi_processor_get_power_info(pr))
14051404
pr->flags.power_setup_done = 1;
14061405

1407-
if (pr->flags.power) {
1408-
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
1409-
if (!dev)
1410-
return -ENOMEM;
1411-
per_cpu(acpi_cpuidle_device, pr->id) = dev;
1406+
if (!pr->flags.power)
1407+
return;
14121408

1413-
acpi_processor_setup_cpuidle_dev(pr, dev);
1409+
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
1410+
if (!dev)
1411+
return;
14141412

1415-
/* Register per-cpu cpuidle_device. Cpuidle driver
1416-
* must already be registered before registering device
1417-
*/
1418-
retval = cpuidle_register_device(dev);
1419-
if (retval) {
1413+
per_cpu(acpi_cpuidle_device, pr->id) = dev;
14201414

1421-
per_cpu(acpi_cpuidle_device, pr->id) = NULL;
1422-
kfree(dev);
1423-
return retval;
1424-
}
1415+
acpi_processor_setup_cpuidle_dev(pr, dev);
1416+
1417+
/*
1418+
* Register a cpuidle device for this CPU. The cpuidle driver using
1419+
* this device is expected to be registered.
1420+
*/
1421+
if (cpuidle_register_device(dev)) {
1422+
per_cpu(acpi_cpuidle_device, pr->id) = NULL;
1423+
kfree(dev);
14251424
}
1426-
return 0;
14271425
}
14281426

1429-
int acpi_processor_power_exit(struct acpi_processor *pr)
1427+
void acpi_processor_power_exit(struct acpi_processor *pr)
14301428
{
14311429
struct cpuidle_device *dev = per_cpu(acpi_cpuidle_device, pr->id);
14321430

14331431
if (disabled_by_idle_boot_param())
1434-
return 0;
1432+
return;
14351433

14361434
if (pr->flags.power) {
14371435
cpuidle_unregister_device(dev);
14381436
kfree(dev);
14391437
}
14401438

14411439
pr->flags.power_setup_done = 0;
1442-
return 0;
14431440
}
14441441

14451442
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)