Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ded24019 authored by Fu Wei's avatar Fu Wei Committed by Mark Rutland
Browse files

clocksource: arm_arch_timer: clean up printk usage 



Almost all string in the arm_arch_timer driver duplicate an common
prefix (though a few do not). For consistency, it would be better to use
pr_fmt(), and always use this prefix. At the same time, we may as well
clean up some whitespace issues in arch_timer_banner and
arch_timer_init.

No functional change.

Signed-off-by: default avatarFu Wei <fu.wei@linaro.org>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Tested-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
[Mark: reword commit message]
Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
parent d003d029

drivers/clocksource/arm_arch_timer.c

+25 −24
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ 


#include <clocksource/arm_arch_timer.h>



#undef pr_fmt

#define pr_fmt(fmt) "arch_timer: " fmt



#define CNTTIDR		0x08

#define CNTTIDR_VIRT(n)	(BIT(1) << ((n) * 4))
@@ -846,12 +849,12 @@ arch_timer_detect_rate(void __iomem *cntbase, struct device_node *np) 


	/* Check the timer frequency. */

	if (arch_timer_rate == 0)

		pr_warn("Architected timer frequency not available\n");

		pr_warn("frequency not available\n");

}



static void arch_timer_banner(unsigned type)

{

	pr_info("Architected %s%s%s timer(s) running at %lu.%02luMHz (%s%s%s).\n",

	pr_info("%s%s%s timer(s) running at %lu.%02luMHz (%s%s%s).\n",

		type & ARCH_CP15_TIMER ? "cp15" : "",

		type == (ARCH_CP15_TIMER | ARCH_MEM_TIMER) ?  " and " : "",

		type & ARCH_MEM_TIMER ? "mmio" : "",
@@ -922,8 +925,7 @@ static void __init arch_counter_register(unsigned type) 


static void arch_timer_stop(struct clock_event_device *clk)

{

	pr_debug("arch_timer_teardown disable IRQ%d cpu #%d\n",

		 clk->irq, smp_processor_id());

	pr_debug("disable IRQ%d cpu #%d\n", clk->irq, smp_processor_id());



	disable_percpu_irq(arch_timer_ppi[arch_timer_uses_ppi]);

	if (arch_timer_has_nonsecure_ppi())
@@ -1016,8 +1018,7 @@ static int __init arch_timer_register(void) 
	}



	if (err) {

		pr_err("arch_timer: can't register interrupt %d (%d)\n",

		       ppi, err);

		pr_err("can't register interrupt %d (%d)\n", ppi, err);

		goto out_free;

	}
@@ -1070,7 +1071,7 @@ static int __init arch_timer_mem_register(void __iomem *base, unsigned int irq) 


	ret = request_irq(irq, func, IRQF_TIMER, "arch_mem_timer", &t->evt);

	if (ret) {

		pr_err("arch_timer: Failed to request mem timer irq\n");

		pr_err("Failed to request mem timer irq\n");

		kfree(t);

	}
@@ -1148,7 +1149,7 @@ static int __init arch_timer_init(void) 
		}



		if (!has_ppi) {

			pr_warn("arch_timer: No interrupt available, giving up\n");

			pr_warn("No interrupt available, giving up\n");

			return -EINVAL;

		}

	}
@@ -1171,7 +1172,7 @@ static int __init arch_timer_of_init(struct device_node *np) 
	int i;



	if (arch_timers_present & ARCH_CP15_TIMER) {

		pr_warn("arch_timer: multiple nodes in dt, skipping\n");

		pr_warn("multiple nodes in dt, skipping\n");

		return 0;

	}
@@ -1213,7 +1214,7 @@ static int __init arch_timer_mem_init(struct device_node *np) 
	arch_timers_present |= ARCH_MEM_TIMER;

	cntctlbase = of_iomap(np, 0);

	if (!cntctlbase) {

		pr_err("arch_timer: Can't find CNTCTLBase\n");

		pr_err("Can't find CNTCTLBase\n");

		return -ENXIO;

	}
@@ -1228,7 +1229,7 @@ static int __init arch_timer_mem_init(struct device_node *np) 
		u32 cntacr;



		if (of_property_read_u32(frame, "frame-number", &n)) {

			pr_err("arch_timer: Missing frame-number\n");

			pr_err("Missing frame-number\n");

			of_node_put(frame);

			goto out;

		}
@@ -1258,7 +1259,7 @@ static int __init arch_timer_mem_init(struct device_node *np) 
	base = arch_counter_base = of_io_request_and_map(best_frame, 0,

							 "arch_mem_timer");

	if (IS_ERR(base)) {

		pr_err("arch_timer: Can't map frame's registers\n");

		pr_err("Can't map frame's registers\n");

		goto out;

	}
@@ -1269,7 +1270,7 @@ static int __init arch_timer_mem_init(struct device_node *np) 


	ret = -EINVAL;

	if (!irq) {

		pr_err("arch_timer: Frame missing %s irq",

		pr_err("Frame missing %s irq.\n",

		       arch_timer_mem_use_virtual ? "virt" : "phys");

		goto out;

	}
@@ -1311,7 +1312,7 @@ static int __init arch_timer_acpi_init(struct acpi_table_header *table) 
	struct acpi_table_gtdt *gtdt;



	if (arch_timers_present & ARCH_CP15_TIMER) {

		pr_warn("arch_timer: already initialized, skipping\n");

		pr_warn("already initialized, skipping\n");

		return -EINVAL;

	}