Skip to content

Commit 155f8d4

Browse files
Marc Zyngierctmarinas
authored andcommitted
ACPI: GTDT: Get rid of acpi_arch_timer_mem_init()
Since 0f67b56 ("clocksource/drivers/arm_arch_timer_mmio: Switch over to standalone driver"), acpi_arch_timer_mem_init() is unused. Remove it. Signed-off-by: Marc Zyngier <maz@kernel.org> Cc: Hanjun Guo <guohanjun@huawei.com> Cc: Sudeep Holla <sudeep.holla@arm.com> Cc: Rafael J. Wysocki <rafael@kernel.org> Cc: Daniel Lezcano <daniel.lezcano@linaro.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Mark Rutland <mark.rutland@arm.com> Acked-by: Hanjun Guo <guohanjun@huawei.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
1 parent 3a86608 commit 155f8d4

2 files changed

Lines changed: 0 additions & 35 deletions

File tree

drivers/acpi/arm64/gtdt.c

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -303,40 +303,6 @@ static int __init gtdt_parse_timer_block(struct acpi_gtdt_timer_block *block,
303303
return -EINVAL;
304304
}
305305

306-
/**
307-
* acpi_arch_timer_mem_init() - Get the info of all GT blocks in GTDT table.
308-
* @timer_mem: The pointer to the array of struct arch_timer_mem for returning
309-
* the result of parsing. The element number of this array should
310-
* be platform_timer_count(the total number of platform timers).
311-
* @timer_count: It points to a integer variable which is used for storing the
312-
* number of GT blocks we have parsed.
313-
*
314-
* Return: 0 if success, -EINVAL/-ENODEV if error.
315-
*/
316-
int __init acpi_arch_timer_mem_init(struct arch_timer_mem *timer_mem,
317-
int *timer_count)
318-
{
319-
int ret;
320-
void *platform_timer;
321-
322-
*timer_count = 0;
323-
for_each_platform_timer(platform_timer) {
324-
if (is_timer_block(platform_timer)) {
325-
ret = gtdt_parse_timer_block(platform_timer, timer_mem);
326-
if (ret)
327-
return ret;
328-
timer_mem++;
329-
(*timer_count)++;
330-
}
331-
}
332-
333-
if (*timer_count)
334-
pr_info("found %d memory-mapped timer block(s).\n",
335-
*timer_count);
336-
337-
return 0;
338-
}
339-
340306
/*
341307
* Initialize a SBSA generic Watchdog platform device info from GTDT
342308
*/

include/linux/acpi.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,6 @@ int acpi_reconfig_notifier_unregister(struct notifier_block *nb);
755755
int acpi_gtdt_init(struct acpi_table_header *table, int *platform_timer_count);
756756
int acpi_gtdt_map_ppi(int type);
757757
bool acpi_gtdt_c3stop(int type);
758-
int acpi_arch_timer_mem_init(struct arch_timer_mem *timer_mem, int *timer_count);
759758
#endif
760759

761760
#ifndef ACPI_HAVE_ARCH_SET_ROOT_POINTER

0 commit comments

Comments
 (0)