aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Lezcano <daniel.lezcano@linaro.org>2017-05-26 11:42:25 -0400
committerDaniel Lezcano <daniel.lezcano@linaro.org>2017-06-14 05:59:53 -0400
commit77d62f532282010d5859a99819d6a0c233bfcfff (patch)
treed59af855eb8b3ea481977de97e8e67b1a90e0f38
parentba5d08c0ea785d5710c5a1e7dc3182b7124d63c0 (diff)
clocksource/drivers: Rename CLOCKSOURCE_ACPI_DECLARE to TIMER_ACPI_DECLARE
The macro name is now renamed to 'TIMER_ACPI_DECLARE' for consistency with the CLOCKSOURCE_OF_DECLARE => TIMER_OF_DECLARE change. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/clocksource/arm_arch_timer.c2
-rw-r--r--include/linux/clocksource.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index bc60cd78698e..a89d41cff915 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -1516,5 +1516,5 @@ static int __init arch_timer_acpi_init(struct acpi_table_header *table)
1516 1516
1517 return arch_timer_common_init(); 1517 return arch_timer_common_init();
1518} 1518}
1519CLOCKSOURCE_ACPI_DECLARE(arch_timer, ACPI_SIG_GTDT, arch_timer_acpi_init); 1519TIMER_ACPI_DECLARE(arch_timer, ACPI_SIG_GTDT, arch_timer_acpi_init);
1520#endif 1520#endif
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index 010bb9f60db2..e43f37f9a1b6 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -258,7 +258,7 @@ extern void timer_probe(void);
258static inline void timer_probe(void) {} 258static inline void timer_probe(void) {}
259#endif 259#endif
260 260
261#define CLOCKSOURCE_ACPI_DECLARE(name, table_id, fn) \ 261#define TIMER_ACPI_DECLARE(name, table_id, fn) \
262 ACPI_DECLARE_PROBE_ENTRY(clksrc, name, table_id, 0, NULL, 0, fn) 262 ACPI_DECLARE_PROBE_ENTRY(clksrc, name, table_id, 0, NULL, 0, fn)
263 263
264#endif /* _LINUX_CLOCKSOURCE_H */ 264#endif /* _LINUX_CLOCKSOURCE_H */