Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1219210

[PATCH 5/5] clocksource/arm_arch_timer: Convert to ACPI probing

Show all headers | View raw

It is now absolutely trivial to convert the arch timer driver to
use ACPI probing, just like its DT counterpart.

Let's enjoy another crapectomy.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
 arch/arm64/kernel/time.c             |  6 ------
 drivers/clocksource/arm_arch_timer.c | 10 +---------
 include/linux/clocksource.h          |  6 ------
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/arch/arm64/kernel/time.c b/arch/arm64/kernel/time.c
index 42f9195..4e56739 100644
--- a/arch/arm64/kernel/time.c
+++ b/arch/arm64/kernel/time.c
@@ -73,12 +73,6 @@ void __init time_init(void)
 
 	tick_setup_hrtimer_broadcast();
 
-	/*
-	 * Since ACPI or FDT will only one be available in the system,
-	 * we can use acpi_generic_timer_init() here safely
-	 */
-	acpi_generic_timer_init();
-
 	arch_timer_rate = arch_timer_get_rate();
 	if (!arch_timer_rate)
 		panic("Unable to initialise architected timer.\n");
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 0aa135d..ba4e6f2 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -872,13 +872,5 @@ static int __init arch_timer_acpi_init(struct acpi_table_header *table)
 	arch_timer_init();
 	return 0;
 }
-
-/* Initialize all the generic timers presented in GTDT */
-void __init acpi_generic_timer_init(void)
-{
-	if (acpi_disabled)
-		return;
-
-	acpi_table_parse(ACPI_SIG_GTDT, arch_timer_acpi_init);
-}
+DEVICE_ACPI_DECLARE(arch_timer, ACPI_SIG_GTDT, arch_timer_acpi_init);
 #endif
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index 278dd27..a25fc6e 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -252,10 +252,4 @@ extern void clocksource_of_init(void);
 static inline void clocksource_of_init(void) {}
 #endif
 
-#ifdef CONFIG_ACPI
-void acpi_generic_timer_init(void);
-#else
-static inline void acpi_generic_timer_init(void) { }
-#endif
-
 #endif /* _LINUX_CLOCKSOURCE_H */
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/5] ACPI probing infrastructure Marc Zyngier <marc.zyngier@arm.com> - 2015-09-04 19:10 +0200
  [PATCH 2/5] irqchip/acpi: Add probing infrastructure for ACPI-based irqchips Marc Zyngier <marc.zyngier@arm.com> - 2015-09-04 19:10 +0200
  [PATCH 4/5] clocksource/acpi: Add probing infrastructure for ACPI-based clocksources Marc Zyngier <marc.zyngier@arm.com> - 2015-09-04 19:10 +0200
  [PATCH 5/5] clocksource/arm_arch_timer: Convert to ACPI probing Marc Zyngier <marc.zyngier@arm.com> - 2015-09-04 19:10 +0200
  [PATCH 3/5] irqchip/gic: Convert the GIC driver to ACPI probing Marc Zyngier <marc.zyngier@arm.com> - 2015-09-04 19:10 +0200
  [PATCH 1/5] acpi: Add basic device probing infrastructure Marc Zyngier <marc.zyngier@arm.com> - 2015-09-04 19:10 +0200
  Re: [PATCH 0/5] ACPI probing infrastructure Tomasz Nowicki <tn@semihalf.com> - 2015-09-07 09:00 +0200

csiph-web