Skip to contentSkip to conversation

drivers/clocksource/arm_arch_timer: remove duplicate error message

PATCH Applied Dejin Zheng 3 participants 3 messages Apr 29, 2020 – Jun 1, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drivers/clocksource/arm_arch_timer: remove duplicate error message

it will print an error message by itself when acpi_gtdt_init() goes wrong. so remove the duplicate error message.

---
 drivers/clocksource/arm_arch_timer.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/clocksource/arm_arch_timer.c +1 -3
index 2204a444e801..ecf7b7db2d05 100644
@@ -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);
Signature · 1 line
2.25.0
#1 lore raw
Quoted 4 lines · Dejin Zheng

it will print an error message by itself when acpi_gtdt_init() goes wrong. so remove the duplicate error message.

Applied, thanks

Signature · 10 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
merge bot Applied
#2 lore raw

[tip: timers/core] drivers/clocksource/arm_arch_timer: Remove duplicate error message

In reply to Dejin Zheng
The following commit has been merged into the timers/core branch of tip:

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 <[email protected]>
AuthorDate:    Wed, 29 Apr 2020 23:35:59 +08:00
Committer:     Daniel Lezcano <[email protected]>
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.

---
 drivers/clocksource/arm_arch_timer.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/clocksource/arm_arch_timer.c +1 -3
index d53f4c7..befe54a 100644
@@ -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);