The following commit has been merged into the timers/core branch of tip: Commit-ID: d1b5e55208fd8e1c73876ab6ad1ce93485e3f5a2 Gitweb: https://git.kernel.org/tip/d1b5e55208fd8e1c73876ab6ad1ce93485e3f5a2 Author: Dejin Zheng <zhengdej...@gmail.com> AuthorDate: Wed, 29 Apr 2020 23:35:59 +08:00 Committer: Daniel Lezcano <daniel.lezc...@linaro.org> CommitterDate: Fri, 22 May 2020 23:58:56 +02:00
drivers/clocksource/arm_arch_timer: Remove duplicate error message The function acpi_gtdt_init() prints a message in case of error. Remove the error message after testing if the function fails, otherwise it is a duplicate message. Signed-off-by: Dejin Zheng <zhengdej...@gmail.com> Signed-off-by: Daniel Lezcano <daniel.lezc...@linaro.org> Link: https://lore.kernel.org/r/20200429153559.21189-1-zhengdej...@gmail.com --- drivers/clocksource/arm_arch_timer.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index d53f4c7..befe54a 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -1577,10 +1577,8 @@ static int __init arch_timer_acpi_init(struct acpi_table_header *table) arch_timers_present |= ARCH_TIMER_TYPE_CP15; ret = acpi_gtdt_init(table, &platform_timer_count); - if (ret) { - pr_err("Failed to init GTDT table.\n"); + if (ret) return ret; - } arch_timer_ppi[ARCH_TIMER_PHYS_NONSECURE_PPI] = acpi_gtdt_map_ppi(ARCH_TIMER_PHYS_NONSECURE_PPI);
