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>

diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 341825e8ac633c3f0d210c033dec418510cdac69..22909fccf0b1c92568ab3294f9f04e1f49e25b6c 100644 (file)
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -732,8 +732,8 @@ static int __cpuidle acpi_idle_enter_s2idle(struct cpuidle_device *dev,
        return 0;
 }
 
-static int acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr,
-                                          struct cpuidle_device *dev)
+static void acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr,
+                                           struct cpuidle_device *dev)
 {
        int i, count = ACPI_IDLE_STATE_START;
        struct acpi_processor_cx *cx;
@@ -753,14 +753,9 @@ static int acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr,
                if (count == CPUIDLE_STATE_MAX)
                        break;
        }
-
-       if (!count)
-               return -EINVAL;
-
-       return 0;
 }
 
-static int acpi_processor_setup_cstates(struct acpi_processor *pr)
+static void acpi_processor_setup_cstates(struct acpi_processor *pr)
 {
        int i, count;
        struct acpi_processor_cx *cx;
@@ -822,11 +817,6 @@ static int acpi_processor_setup_cstates(struct acpi_processor *pr)
        }
 
        drv->state_count = count;
-
-       if (!count)
-               return -EINVAL;
-
-       return 0;
 }
 
 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)
        if (pr->flags.has_lpi)
                return acpi_processor_setup_lpi_states(pr);
 
-       return acpi_processor_setup_cstates(pr);
+       acpi_processor_setup_cstates(pr);
+       return 0;
 }
 
 /**
@@ -1261,7 +1252,8 @@ static int acpi_processor_setup_cpuidle_dev(struct acpi_processor *pr,
        if (pr->flags.has_lpi)
                return acpi_processor_ffh_lpi_probe(pr->id);
 
-       return acpi_processor_setup_cpuidle_cx(pr, dev);
+       acpi_processor_setup_cpuidle_cx(pr, dev);
+       return 0;
 }
 
 static int acpi_processor_get_power_info(struct acpi_processor *pr)