Now that the cpufreq framework validates the lcore ID using RTE_POWER_VALID_LCOREID_OR_ERR_RET() before dispatching to any driver, each individual cpufreq driver no longer needs its own range check against RTE_MAX_LCORE.
Remove the duplicated lcore ID checks from the acpi cpufreq driver ops. Signed-off-by: Huisong Li <[email protected]> --- drivers/power/acpi/acpi_cpufreq.c | 65 ------------------------------- 1 file changed, 65 deletions(-) diff --git a/drivers/power/acpi/acpi_cpufreq.c b/drivers/power/acpi/acpi_cpufreq.c index 875c66336d..af85a8cdec 100644 --- a/drivers/power/acpi/acpi_cpufreq.c +++ b/drivers/power/acpi/acpi_cpufreq.c @@ -234,12 +234,6 @@ power_acpi_cpufreq_init(unsigned int lcore_id) return -1; } - if (lcore_id >= RTE_MAX_LCORE) { - POWER_LOG(ERR, "Lcore id %u can not exceeds %u", - lcore_id, RTE_MAX_LCORE - 1U); - return -1; - } - pi = &lcore_power_info[lcore_id]; exp_state = POWER_IDLE; /* The power in use state works as a guard variable between @@ -311,11 +305,6 @@ power_acpi_cpufreq_exit(unsigned int lcore_id) struct acpi_power_info *pi; uint32_t exp_state; - if (lcore_id >= RTE_MAX_LCORE) { - POWER_LOG(ERR, "Lcore id %u can not exceeds %u", - lcore_id, RTE_MAX_LCORE - 1U); - return -1; - } pi = &lcore_power_info[lcore_id]; exp_state = POWER_USED; /* The power in use state works as a guard variable between @@ -365,11 +354,6 @@ power_acpi_cpufreq_freqs(unsigned int lcore_id, uint32_t *freqs, uint32_t num) { struct acpi_power_info *pi; - if (lcore_id >= RTE_MAX_LCORE) { - POWER_LOG(ERR, "Invalid lcore ID"); - return 0; - } - if (freqs == NULL) { POWER_LOG(ERR, "NULL buffer supplied"); return 0; @@ -388,22 +372,12 @@ power_acpi_cpufreq_freqs(unsigned int lcore_id, uint32_t *freqs, uint32_t num) uint32_t power_acpi_cpufreq_get_freq(unsigned int lcore_id) { - if (lcore_id >= RTE_MAX_LCORE) { - POWER_LOG(ERR, "Invalid lcore ID"); - return RTE_POWER_INVALID_FREQ_INDEX; - } - return lcore_power_info[lcore_id].curr_idx; } int power_acpi_cpufreq_set_freq(unsigned int lcore_id, uint32_t index) { - if (lcore_id >= RTE_MAX_LCORE) { - POWER_LOG(ERR, "Invalid lcore ID"); - return -1; - } - return set_freq_internal(&(lcore_power_info[lcore_id]), index); } @@ -412,11 +386,6 @@ power_acpi_cpufreq_freq_down(unsigned int lcore_id) { struct acpi_power_info *pi; - if (lcore_id >= RTE_MAX_LCORE) { - POWER_LOG(ERR, "Invalid lcore ID"); - return -1; - } - pi = &lcore_power_info[lcore_id]; if (pi->curr_idx + 1 == pi->nb_freqs) return 0; @@ -430,11 +399,6 @@ power_acpi_cpufreq_freq_up(unsigned int lcore_id) { struct acpi_power_info *pi; - if (lcore_id >= RTE_MAX_LCORE) { - POWER_LOG(ERR, "Invalid lcore ID"); - return -1; - } - pi = &lcore_power_info[lcore_id]; if (pi->curr_idx == 0 || (pi->curr_idx == 1 && pi->turbo_available && !pi->turbo_enable)) @@ -447,11 +411,6 @@ power_acpi_cpufreq_freq_up(unsigned int lcore_id) int power_acpi_cpufreq_freq_max(unsigned int lcore_id) { - if (lcore_id >= RTE_MAX_LCORE) { - POWER_LOG(ERR, "Invalid lcore ID"); - return -1; - } - /* Frequencies in the array are from high to low. */ if (lcore_power_info[lcore_id].turbo_available) { if (lcore_power_info[lcore_id].turbo_enable) @@ -471,11 +430,6 @@ power_acpi_cpufreq_freq_min(unsigned int lcore_id) { struct acpi_power_info *pi; - if (lcore_id >= RTE_MAX_LCORE) { - POWER_LOG(ERR, "Invalid lcore ID"); - return -1; - } - pi = &lcore_power_info[lcore_id]; /* Frequencies in the array are from high to low. */ @@ -488,11 +442,6 @@ power_acpi_turbo_status(unsigned int lcore_id) { struct acpi_power_info *pi; - if (lcore_id >= RTE_MAX_LCORE) { - POWER_LOG(ERR, "Invalid lcore ID"); - return -1; - } - pi = &lcore_power_info[lcore_id]; return pi->turbo_enable; @@ -504,11 +453,6 @@ power_acpi_enable_turbo(unsigned int lcore_id) { struct acpi_power_info *pi; - if (lcore_id >= RTE_MAX_LCORE) { - POWER_LOG(ERR, "Invalid lcore ID"); - return -1; - } - pi = &lcore_power_info[lcore_id]; if (pi->turbo_available) @@ -537,11 +481,6 @@ power_acpi_disable_turbo(unsigned int lcore_id) { struct acpi_power_info *pi; - if (lcore_id >= RTE_MAX_LCORE) { - POWER_LOG(ERR, "Invalid lcore ID"); - return -1; - } - pi = &lcore_power_info[lcore_id]; pi->turbo_enable = 0; @@ -564,10 +503,6 @@ int power_acpi_get_capabilities(unsigned int lcore_id, { struct acpi_power_info *pi; - if (lcore_id >= RTE_MAX_LCORE) { - POWER_LOG(ERR, "Invalid lcore ID"); - return -1; - } if (caps == NULL) { POWER_LOG(ERR, "Invalid argument"); return -1; -- 2.33.0
