Skip to content

Commit 77ca161

Browse files
LiHuiSong1rafaeljw
authored andcommitted
ACPI: processor: idle: Drop redundant C-state count checks
acpi_processor_setup_cstates() and acpi_processor_setup_cpuidle_cx() are called after successfully obtaining power information. Among other things, these setup functions check the C-state count against zero. However, that check is done by acpi_processor_get_power_info_cst() which will cause acpi_processor_get_power_info() to fail if it does no pass, so the checks in the two functions mentioned above are redundant. Drop those redundant checks. No intentional functional impact. Signed-off-by: Huisong Li <lihuisong@huawei.com> [ rjw: Subject and changelog rewrite ] Link: https://patch.msgid.link/20251105093647.3557248-1-lihuisong@huawei.com Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 945661d commit 77ca161

1 file changed

Lines changed: 7 additions & 15 deletions

File tree

drivers/acpi/processor_idle.c

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -732,8 +732,8 @@ static int __cpuidle acpi_idle_enter_s2idle(struct cpuidle_device *dev,
732732
return 0;
733733
}
734734

735-
static int acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr,
736-
struct cpuidle_device *dev)
735+
static void acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr,
736+
struct cpuidle_device *dev)
737737
{
738738
int i, count = ACPI_IDLE_STATE_START;
739739
struct acpi_processor_cx *cx;
@@ -753,14 +753,9 @@ static int acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr,
753753
if (count == CPUIDLE_STATE_MAX)
754754
break;
755755
}
756-
757-
if (!count)
758-
return -EINVAL;
759-
760-
return 0;
761756
}
762757

763-
static int acpi_processor_setup_cstates(struct acpi_processor *pr)
758+
static void acpi_processor_setup_cstates(struct acpi_processor *pr)
764759
{
765760
int i, count;
766761
struct acpi_processor_cx *cx;
@@ -822,11 +817,6 @@ static int acpi_processor_setup_cstates(struct acpi_processor *pr)
822817
}
823818

824819
drv->state_count = count;
825-
826-
if (!count)
827-
return -EINVAL;
828-
829-
return 0;
830820
}
831821

832822
static inline void acpi_processor_cstate_first_run_checks(void)
@@ -1241,7 +1231,8 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
12411231
if (pr->flags.has_lpi)
12421232
return acpi_processor_setup_lpi_states(pr);
12431233

1244-
return acpi_processor_setup_cstates(pr);
1234+
acpi_processor_setup_cstates(pr);
1235+
return 0;
12451236
}
12461237

12471238
/**
@@ -1261,7 +1252,8 @@ static int acpi_processor_setup_cpuidle_dev(struct acpi_processor *pr,
12611252
if (pr->flags.has_lpi)
12621253
return acpi_processor_ffh_lpi_probe(pr->id);
12631254

1264-
return acpi_processor_setup_cpuidle_cx(pr, dev);
1255+
acpi_processor_setup_cpuidle_cx(pr, dev);
1256+
return 0;
12651257
}
12661258

12671259
static int acpi_processor_get_power_info(struct acpi_processor *pr)

0 commit comments

Comments
 (0)