Commit 155f8d4e authored by Marc Zyngier's avatar Marc Zyngier Committed by Catalin Marinas
Browse files

ACPI: GTDT: Get rid of acpi_arch_timer_mem_init() 



Since 0f67b56d ("clocksource/drivers/arm_arch_timer_mmio: Switch
over to standalone driver"), acpi_arch_timer_mem_init() is unused.

Remove it.

Signed-off-by: default avatarMarc 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: default avatarHanjun Guo <guohanjun@huawei.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 3a866087

drivers/acpi/arm64/gtdt.c

+0 −34
Original line number Diff line number Diff line
@@ -303,40 +303,6 @@ static int __init gtdt_parse_timer_block(struct acpi_gtdt_timer_block *block, 
	return -EINVAL;

}



/**

 * acpi_arch_timer_mem_init() - Get the info of all GT blocks in GTDT table.

 * @timer_mem:	The pointer to the array of struct arch_timer_mem for returning

 *		the result of parsing. The element number of this array should

 *		be platform_timer_count(the total number of platform timers).

 * @timer_count: It points to a integer variable which is used for storing the

 *		number of GT blocks we have parsed.

 *

 * Return: 0 if success, -EINVAL/-ENODEV if error.

 */

int __init acpi_arch_timer_mem_init(struct arch_timer_mem *timer_mem,

				    int *timer_count)

{

	int ret;

	void *platform_timer;



	*timer_count = 0;

	for_each_platform_timer(platform_timer) {

		if (is_timer_block(platform_timer)) {

			ret = gtdt_parse_timer_block(platform_timer, timer_mem);

			if (ret)

				return ret;

			timer_mem++;

			(*timer_count)++;

		}

	}



	if (*timer_count)

		pr_info("found %d memory-mapped timer block(s).\n",

			*timer_count);



	return 0;

}



/*

 * Initialize a SBSA generic Watchdog platform device info from GTDT

 */

include/linux/acpi.h

+0 −1
Original line number Diff line number Diff line
@@ -755,7 +755,6 @@ int acpi_reconfig_notifier_unregister(struct notifier_block *nb); 
int acpi_gtdt_init(struct acpi_table_header *table, int *platform_timer_count);

int acpi_gtdt_map_ppi(int type);

bool acpi_gtdt_c3stop(int type);

int acpi_arch_timer_mem_init(struct arch_timer_mem *timer_mem, int *timer_count);

#endif



#ifndef ACPI_HAVE_ARCH_SET_ROOT_POINTER