[PATCH 3/5] ACPI: PPTT: Remove acpi_find_cache_levels()

[Jeremy Linton]

On 11/8/22 05:04, Pierre Gondois wrote:
> acpi_find_cache_levels() is used at a single place and is short
> enough to be merged into the calling function. The removal allows
> an easier renaming of the calling function in the next patch.
> 
> Also reorder the parameters in the 'reversed Christmas tree' order.
> 
> Signed-off-by: Pierre Gondois <pierre.gondois at arm.com>

This bit looks fine too:

Reviewed-by: Jeremy Linton <jeremy.linton at arm.com>


> ---
>   drivers/acpi/pptt.c | 21 ++++++---------------
>   1 file changed, 6 insertions(+), 15 deletions(-)
> 
> diff --git a/drivers/acpi/pptt.c b/drivers/acpi/pptt.c
> index c91342dcbcd6..97c1d33822d1 100644
> --- a/drivers/acpi/pptt.c
> +++ b/drivers/acpi/pptt.c
> @@ -281,19 +281,6 @@ static struct acpi_pptt_processor *acpi_find_processor_node(struct acpi_table_he
>   	return NULL;
>   }
>   
> -static int acpi_find_cache_levels(struct acpi_table_header *table_hdr,
> -				  u32 acpi_cpu_id)
> -{
> -	int number_of_levels = 0;
> -	struct acpi_pptt_processor *cpu;
> -
> -	cpu = acpi_find_processor_node(table_hdr, acpi_cpu_id);
> -	if (cpu)
> -		number_of_levels = acpi_count_levels(table_hdr, cpu);
> -
> -	return number_of_levels;
> -}
> -
>   static u8 acpi_cache_type(enum cache_type type)
>   {
>   	switch (type) {
> @@ -613,9 +600,10 @@ static int check_acpi_cpu_flag(unsigned int cpu, int rev, u32 flag)
>    */
>   int acpi_find_last_cache_level(unsigned int cpu)
>   {
> -	u32 acpi_cpu_id;
> +	struct acpi_pptt_processor *cpu_node;
>   	struct acpi_table_header *table;
>   	int number_of_levels = 0;
> +	u32 acpi_cpu_id;
>   
>   	table = acpi_get_pptt();
>   	if (!table)
> @@ -624,7 +612,10 @@ int acpi_find_last_cache_level(unsigned int cpu)
>   	pr_debug("Cache Setup find last level CPU=%d\n", cpu);
>   
>   	acpi_cpu_id = get_acpi_id_for_cpu(cpu);
> -	number_of_levels = acpi_find_cache_levels(table, acpi_cpu_id);
> +	cpu_node = acpi_find_processor_node(table, acpi_cpu_id);
> +	if (cpu_node)
> +		number_of_levels = acpi_count_levels(table, cpu_node);
> +
>   	pr_debug("Cache Setup find last level level=%d\n", number_of_levels);
>   
>   	return number_of_levels;