Skip to content

Commit 7128af8

Browse files
committed
ACPI: Remove the unused find_acpi_cpu_cache_topology()
The sole user of this find_acpi_cpu_cache_topology() was arm64 topology which is now consolidated into the generic arch_topology without the need of this function. Drop the unused function find_acpi_cpu_cache_topology(). Link: https://lore.kernel.org/r/[email protected] Cc: Rafael J. Wysocki <[email protected]> Reported-by: Ionela Voinescu <[email protected]> Tested-by: Conor Dooley <[email protected]> Acked-by: Rafael J. Wysocki <[email protected]> Signed-off-by: Sudeep Holla <[email protected]>
1 parent 00e66e3 commit 7128af8

File tree

2 files changed

+0
-42
lines changed

2 files changed

+0
-42
lines changed

drivers/acpi/pptt.c

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -691,43 +691,6 @@ int find_acpi_cpu_topology(unsigned int cpu, int level)
691691
return find_acpi_cpu_topology_tag(cpu, level, 0);
692692
}
693693

694-
/**
695-
* find_acpi_cpu_cache_topology() - Determine a unique cache topology value
696-
* @cpu: Kernel logical CPU number
697-
* @level: The cache level for which we would like a unique ID
698-
*
699-
* Determine a unique ID for each unified cache in the system
700-
*
701-
* Return: -ENOENT if the PPTT doesn't exist, or the CPU cannot be found.
702-
* Otherwise returns a value which represents a unique topological feature.
703-
*/
704-
int find_acpi_cpu_cache_topology(unsigned int cpu, int level)
705-
{
706-
struct acpi_table_header *table;
707-
struct acpi_pptt_cache *found_cache;
708-
acpi_status status;
709-
u32 acpi_cpu_id = get_acpi_id_for_cpu(cpu);
710-
struct acpi_pptt_processor *cpu_node = NULL;
711-
int ret = -1;
712-
713-
status = acpi_get_table(ACPI_SIG_PPTT, 0, &table);
714-
if (ACPI_FAILURE(status)) {
715-
acpi_pptt_warn_missing();
716-
return -ENOENT;
717-
}
718-
719-
found_cache = acpi_find_cache_node(table, acpi_cpu_id,
720-
CACHE_TYPE_UNIFIED,
721-
level,
722-
&cpu_node);
723-
if (found_cache)
724-
ret = ACPI_PTR_DIFF(cpu_node, table);
725-
726-
acpi_put_table(table);
727-
728-
return ret;
729-
}
730-
731694
/**
732695
* find_acpi_cpu_topology_package() - Determine a unique CPU package value
733696
* @cpu: Kernel logical CPU number

include/linux/acpi.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1429,7 +1429,6 @@ int find_acpi_cpu_topology(unsigned int cpu, int level);
14291429
int find_acpi_cpu_topology_cluster(unsigned int cpu);
14301430
int find_acpi_cpu_topology_package(unsigned int cpu);
14311431
int find_acpi_cpu_topology_hetero_id(unsigned int cpu);
1432-
int find_acpi_cpu_cache_topology(unsigned int cpu, int level);
14331432
#else
14341433
static inline int acpi_pptt_cpu_is_thread(unsigned int cpu)
14351434
{
@@ -1451,10 +1450,6 @@ static inline int find_acpi_cpu_topology_hetero_id(unsigned int cpu)
14511450
{
14521451
return -EINVAL;
14531452
}
1454-
static inline int find_acpi_cpu_cache_topology(unsigned int cpu, int level)
1455-
{
1456-
return -EINVAL;
1457-
}
14581453
#endif
14591454

14601455
#ifdef CONFIG_ACPI_PCC

0 commit comments

Comments
 (0)