[PATCH] ACPI: GTDT: Get rid of acpi_arch_timer_mem_init()

[PATCH] ACPI: GTDT: Get rid of acpi_arch_timer_mem_init()

[Marc Zyngier]

Since 0f67b56d84b4c ("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>
---
 drivers/acpi/arm64/gtdt.c | 34 ----------------------------------
 include/linux/acpi.h      |  1 -
 2 files changed, 35 deletions(-)

diff --git a/drivers/acpi/arm64/gtdt.c b/drivers/acpi/arm64/gtdt.c
index 8cc8af8fd408c..ffc867bac2d60 100644
--- a/drivers/acpi/arm64/gtdt.c
+++ b/drivers/acpi/arm64/gtdt.c
@@ -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
  */
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 5ff5d99f6ead5..22b377c3a3196 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -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
-- 
2.47.3

Re: [PATCH] ACPI: GTDT: Get rid of acpi_arch_timer_mem_init()

[Marc Zyngier]

On 2025-10-30 11:01, Marc Zyngier wrote:
> Since 0f67b56d84b4c ("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>
> ---
>  drivers/acpi/arm64/gtdt.c | 34 ----------------------------------
>  include/linux/acpi.h      |  1 -
>  2 files changed, 35 deletions(-)
> 
> diff --git a/drivers/acpi/arm64/gtdt.c b/drivers/acpi/arm64/gtdt.c
> index 8cc8af8fd408c..ffc867bac2d60 100644
> --- a/drivers/acpi/arm64/gtdt.c
> +++ b/drivers/acpi/arm64/gtdt.c
> @@ -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
>   */
> diff --git a/include/linux/acpi.h b/include/linux/acpi.h
> index 5ff5d99f6ead5..22b377c3a3196 100644
> --- a/include/linux/acpi.h
> +++ b/include/linux/acpi.h
> @@ -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

This isn't urgent, but would be a good 6.19 candidate.

Thanks,

         M.
-- 
Jazz is not dead. It just smells funny...

Re: [PATCH] ACPI: GTDT: Get rid of acpi_arch_timer_mem_init()

[Hanjun Guo]

On 2025/10/30 19:01, Marc Zyngier wrote:
> Since 0f67b56d84b4c ("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>

Acked-by: Hanjun Guo <guohanjun@huawei.com>

Thanks
Hanjun

Re: [PATCH] ACPI: GTDT: Get rid of acpi_arch_timer_mem_init()

[Catalin Marinas]

On Thu, 30 Oct 2025 11:01:37 +0000, Marc Zyngier wrote:
> Since 0f67b56d84b4c ("clocksource/drivers/arm_arch_timer_mmio: Switch
> over to standalone driver"), acpi_arch_timer_mem_init() is unused.
> 
> Remove it.
> 
> 

Applied to arm64 (for-next/acpi), thanks!

[1/1] ACPI: GTDT: Get rid of acpi_arch_timer_mem_init()
      https://git.kernel.org/arm64/c/155f8d4ef0b7

-- 
Catalin


-- 
Catalin