| Message ID | 20200429153559.21189-1-zhengdejin5@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | d1b5e55208fd8e1c73876ab6ad1ce93485e3f5a2 |
| Headers | show |
| Series | [v1] drivers/clocksource/arm_arch_timer: remove duplicate error message | expand |
On 29/04/2020 17:35, Dejin Zheng wrote: > it will print an error message by itself when acpi_gtdt_init() > goes wrong. so remove the duplicate error message. > > Signed-off-by: Dejin Zheng <zhengdejin5@gmail.com> Applied, thanks
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 2204a444e801..ecf7b7db2d05 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -1588,10 +1588,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);
it will print an error message by itself when acpi_gtdt_init() goes wrong. so remove the duplicate error message. Signed-off-by: Dejin Zheng <zhengdejin5@gmail.com> --- drivers/clocksource/arm_arch_timer.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)