diff mbox

[v6,03/10] clocksource/drivers/arm_arch_timer: Improve printk relevant code

Message ID 1467224153-22873-4-git-send-email-fu.wei@linaro.org (mailing list archive)
State New, archived
Headers show

Commit Message

fu.wei@linaro.org June 29, 2016, 6:15 p.m. UTC 
From: Fu Wei <fu.wei@linaro.org>

This patch defines pr_fmt(fmt) for all pr_* functions,
then the pr_* don't need to add "arch_timer:" everytime.

Also delete some Blank Spaces in arch_timer_banner,
according to the suggestion from checkpatch.pl.

No functional change.

Signed-off-by: Fu Wei <fu.wei@linaro.org>
---
 drivers/clocksource/arm_arch_timer.c | 52 +++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 25 deletions(-)

Comments

Hanjun Guo June 30, 2016, 2:54 a.m. UTC | #1 
On 2016/6/30 2:15, fu.wei@linaro.org wrote:
> From: Fu Wei <fu.wei@linaro.org>
>
> This patch defines pr_fmt(fmt) for all pr_* functions,
> then the pr_* don't need to add "arch_timer:" everytime.
>
> Also delete some Blank Spaces in arch_timer_banner,
> according to the suggestion from checkpatch.pl.
>
> No functional change.
>
> Signed-off-by: Fu Wei <fu.wei@linaro.org>
> ---
>  drivers/clocksource/arm_arch_timer.c | 52 +++++++++++++++++++-----------------
>  1 file changed, 27 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
> index 966c574..9540e9d 100644
> --- a/drivers/clocksource/arm_arch_timer.c
> +++ b/drivers/clocksource/arm_arch_timer.c
> @@ -29,6 +29,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))
>
> @@ -388,24 +391,24 @@ 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",
> -		     type & ARCH_CP15_TIMER ? "cp15" : "",
> -		     type == (ARCH_CP15_TIMER | ARCH_MEM_TIMER) ?  " and " : "",
> -		     type & ARCH_MEM_TIMER ? "mmio" : "",
> -		     (unsigned long)arch_timer_rate / 1000000,
> -		     (unsigned long)(arch_timer_rate / 10000) % 100,
> -		     type & ARCH_CP15_TIMER ?
> -		     (arch_timer_uses_ppi == VIRT_PPI) ? "virt" : "phys" :
> -			"",
> -		     type == (ARCH_CP15_TIMER | ARCH_MEM_TIMER) ?  "/" : "",
> -		     type & ARCH_MEM_TIMER ?
> -			arch_timer_mem_use_virtual ? "virt" : "phys" :
> -			"");
> +	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" : "",
> +		(unsigned long)arch_timer_rate / 1000000,
> +		(unsigned long)(arch_timer_rate / 10000) % 100,
> +		type & ARCH_CP15_TIMER ?
> +		(arch_timer_uses_ppi == VIRT_PPI) ? "virt" : "phys" :
> +		"",
> +		type == (ARCH_CP15_TIMER | ARCH_MEM_TIMER) ?  "/" : "",
> +		type & ARCH_MEM_TIMER ?
> +		arch_timer_mem_use_virtual ? "virt" : "phys" :
> +		"");
>  }
>
>  u32 arch_timer_get_rate(void)
> @@ -498,7 +501,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",
> +	pr_debug("teardown, disable IRQ%d cpu #%d\n",

Not a problem of this patch, but arch_timer_teardown is a function
name? I can't find where it's defined...

I think we can leave arch_timer as it but update it to:

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

Others are look good to me.

Thanks
Hanjun
fu.wei@linaro.org July 7, 2016, 4:12 p.m. UTC | #2 
Hi Hanjun

On 30 June 2016 at 10:54, Hanjun Guo <hanjun.guo@linaro.org> wrote:
> On 2016/6/30 2:15, fu.wei@linaro.org wrote:
>>
>> From: Fu Wei <fu.wei@linaro.org>
>>
>> This patch defines pr_fmt(fmt) for all pr_* functions,
>> then the pr_* don't need to add "arch_timer:" everytime.
>>
>> Also delete some Blank Spaces in arch_timer_banner,
>> according to the suggestion from checkpatch.pl.
>>
>> No functional change.
>>
>> Signed-off-by: Fu Wei <fu.wei@linaro.org>
>> ---
>>  drivers/clocksource/arm_arch_timer.c | 52
>> +++++++++++++++++++-----------------
>>  1 file changed, 27 insertions(+), 25 deletions(-)
>>
>> diff --git a/drivers/clocksource/arm_arch_timer.c
>> b/drivers/clocksource/arm_arch_timer.c
>> index 966c574..9540e9d 100644
>> --- a/drivers/clocksource/arm_arch_timer.c
>> +++ b/drivers/clocksource/arm_arch_timer.c
>> @@ -29,6 +29,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))
>>
>> @@ -388,24 +391,24 @@ 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",
>> -                    type & ARCH_CP15_TIMER ? "cp15" : "",
>> -                    type == (ARCH_CP15_TIMER | ARCH_MEM_TIMER) ?  " and "
>> : "",
>> -                    type & ARCH_MEM_TIMER ? "mmio" : "",
>> -                    (unsigned long)arch_timer_rate / 1000000,
>> -                    (unsigned long)(arch_timer_rate / 10000) % 100,
>> -                    type & ARCH_CP15_TIMER ?
>> -                    (arch_timer_uses_ppi == VIRT_PPI) ? "virt" : "phys" :
>> -                       "",
>> -                    type == (ARCH_CP15_TIMER | ARCH_MEM_TIMER) ?  "/" :
>> "",
>> -                    type & ARCH_MEM_TIMER ?
>> -                       arch_timer_mem_use_virtual ? "virt" : "phys" :
>> -                       "");
>> +       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" : "",
>> +               (unsigned long)arch_timer_rate / 1000000,
>> +               (unsigned long)(arch_timer_rate / 10000) % 100,
>> +               type & ARCH_CP15_TIMER ?
>> +               (arch_timer_uses_ppi == VIRT_PPI) ? "virt" : "phys" :
>> +               "",
>> +               type == (ARCH_CP15_TIMER | ARCH_MEM_TIMER) ?  "/" : "",
>> +               type & ARCH_MEM_TIMER ?
>> +               arch_timer_mem_use_virtual ? "virt" : "phys" :
>> +               "");
>>  }
>>
>>  u32 arch_timer_get_rate(void)
>> @@ -498,7 +501,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",
>> +       pr_debug("teardown, disable IRQ%d cpu #%d\n",
>
>
> Not a problem of this patch, but arch_timer_teardown is a function
> name? I can't find where it's defined...
>
> I think we can leave arch_timer as it but update it to:
>
> pr_debug("arch_timer_stop disable IRQ%d cpu #%d\n",

If so, you will see "arch_timer: arch_timer_stop disable IRQ%d cpu #%d\n "

I think we can do :

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


>
> Others are look good to me.
>
> Thanks
> Hanjun
diff mbox

Patch

diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 966c574..9540e9d 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -29,6 +29,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))
 
@@ -388,24 +391,24 @@  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",
-		     type & ARCH_CP15_TIMER ? "cp15" : "",
-		     type == (ARCH_CP15_TIMER | ARCH_MEM_TIMER) ?  " and " : "",
-		     type & ARCH_MEM_TIMER ? "mmio" : "",
-		     (unsigned long)arch_timer_rate / 1000000,
-		     (unsigned long)(arch_timer_rate / 10000) % 100,
-		     type & ARCH_CP15_TIMER ?
-		     (arch_timer_uses_ppi == VIRT_PPI) ? "virt" : "phys" :
-			"",
-		     type == (ARCH_CP15_TIMER | ARCH_MEM_TIMER) ?  "/" : "",
-		     type & ARCH_MEM_TIMER ?
-			arch_timer_mem_use_virtual ? "virt" : "phys" :
-			"");
+	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" : "",
+		(unsigned long)arch_timer_rate / 1000000,
+		(unsigned long)(arch_timer_rate / 10000) % 100,
+		type & ARCH_CP15_TIMER ?
+		(arch_timer_uses_ppi == VIRT_PPI) ? "virt" : "phys" :
+		"",
+		type == (ARCH_CP15_TIMER | ARCH_MEM_TIMER) ?  "/" : "",
+		type & ARCH_MEM_TIMER ?
+		arch_timer_mem_use_virtual ? "virt" : "phys" :
+		"");
 }
 
 u32 arch_timer_get_rate(void)
@@ -498,7 +501,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",
+	pr_debug("teardown, disable IRQ%d cpu #%d\n",
 		 clk->irq, smp_processor_id());
 
 	disable_percpu_irq(arch_timer_ppi[arch_timer_uses_ppi]);
@@ -597,8 +600,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;
 	}
 
@@ -650,7 +652,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);
 	}
 
@@ -727,7 +729,7 @@  static void __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;
 		}
 	}
@@ -743,7 +745,7 @@  static void __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;
 	}
 
@@ -778,7 +780,7 @@  static void __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;
 	}
 
@@ -793,7 +795,7 @@  static void __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;
 		}
@@ -821,7 +823,7 @@  static void __init arch_timer_mem_init(struct device_node *np)
 
 	base = arch_counter_base = of_iomap(best_frame, 0);
 	if (!base) {
-		pr_err("arch_timer: Can't map frame's registers\n");
+		pr_err("Can't map frame's registers\n");
 		goto out;
 	}
 
@@ -831,7 +833,7 @@  static void __init arch_timer_mem_init(struct device_node *np)
 		irq = irq_of_parse_and_map(best_frame, PHYS_SPI);
 
 	if (!irq) {
-		pr_err("arch_timer: Frame missing %s irq",
+		pr_err("Frame missing %s irq",
 		       arch_timer_mem_use_virtual ? "virt" : "phys");
 		goto out;
 	}
@@ -869,7 +871,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;
 	}