LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] clocksource/drivers/mips-gic-timer: Add pr_fmt and reword pr_* messages
@ 2017-12-20 14:50 Matt Redfearn
  2018-03-29  9:49 ` [PATCH v2] " Matt Redfearn
  0 siblings, 1 reply; 4+ messages in thread
From: Matt Redfearn @ 2017-12-20 14:50 UTC (permalink / raw)
  To: Daniel Lezcano, Thomas Gleixner; +Cc: linux-mips, Matt Redfearn, linux-kernel

Several messages from the MIPS GIC driver include the text "GIC", "GIC
timer", etc, but the format is not standard. Add a pr_fmt of
"mips-gic-timer: " and reword the messages now that they will be
prefixed with the driver name.

Signed-off-by: Matt Redfearn <matt.redfearn@mips.com>
---

 drivers/clocksource/mips-gic-timer.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c
index a04808a21d4e..b321699d02a2 100644
--- a/drivers/clocksource/mips-gic-timer.c
+++ b/drivers/clocksource/mips-gic-timer.c
@@ -5,6 +5,9 @@
  *
  * Copyright (C) 2012 MIPS Technologies, Inc.  All rights reserved.
  */
+
+#define pr_fmt(fmt) "mips-gic-timer: " fmt
+
 #include <linux/clk.h>
 #include <linux/clockchips.h>
 #include <linux/cpu.h>
@@ -136,8 +139,7 @@ static int gic_clockevent_init(void)
 
 	ret = setup_percpu_irq(gic_timer_irq, &gic_compare_irqaction);
 	if (ret < 0) {
-		pr_err("GIC timer IRQ %d setup failed: %d\n",
-		       gic_timer_irq, ret);
+		pr_err("IRQ %d setup failed (%d)\n", gic_timer_irq, ret);
 		return ret;
 	}
 
@@ -176,7 +178,7 @@ static int __init __gic_clocksource_init(void)
 
 	ret = clocksource_register_hz(&gic_clocksource, gic_frequency);
 	if (ret < 0)
-		pr_warn("GIC: Unable to register clocksource\n");
+		pr_warn("Unable to register clocksource\n");
 
 	return ret;
 }
@@ -188,7 +190,7 @@ static int __init gic_clocksource_of_init(struct device_node *node)
 
 	if (!mips_gic_present() || !node->parent ||
 	    !of_device_is_compatible(node->parent, "mti,gic")) {
-		pr_warn("No DT definition for the mips gic driver\n");
+		pr_warn("No DT definition\n");
 		return -ENXIO;
 	}
 
@@ -196,7 +198,7 @@ static int __init gic_clocksource_of_init(struct device_node *node)
 	if (!IS_ERR(clk)) {
 		ret = clk_prepare_enable(clk);
 		if (ret < 0) {
-			pr_err("GIC failed to enable clock\n");
+			pr_err("Failed to enable clock\n");
 			clk_put(clk);
 			return ret;
 		}
@@ -204,12 +206,12 @@ static int __init gic_clocksource_of_init(struct device_node *node)
 		gic_frequency = clk_get_rate(clk);
 	} else if (of_property_read_u32(node, "clock-frequency",
 					&gic_frequency)) {
-		pr_err("GIC frequency not specified.\n");
+		pr_err("Frequency not specified\n");
 		return -EINVAL;;
 	}
 	gic_timer_irq = irq_of_parse_and_map(node, 0);
 	if (!gic_timer_irq) {
-		pr_err("GIC timer IRQ not specified.\n");
+		pr_err("IRQ not specified\n");
 		return -EINVAL;;
 	}
 
@@ -220,7 +222,7 @@ static int __init gic_clocksource_of_init(struct device_node *node)
 	ret = gic_clockevent_init();
 	if (!ret && !IS_ERR(clk)) {
 		if (clk_notifier_register(clk, &gic_clk_nb) < 0)
-			pr_warn("GIC: Unable to register clock notifier\n");
+			pr_warn("Unable to register clock notifier\n");
 	}
 
 	/* And finally start the counter */
-- 
2.7.4

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH v2] clocksource/drivers/mips-gic-timer: Add pr_fmt and reword pr_* messages
  2017-12-20 14:50 [PATCH] clocksource/drivers/mips-gic-timer: Add pr_fmt and reword pr_* messages Matt Redfearn
@ 2018-03-29  9:49 ` Matt Redfearn
  2018-05-14  9:45   ` Matt Redfearn
  2018-05-14 12:49   ` Daniel Lezcano
  0 siblings, 2 replies; 4+ messages in thread
From: Matt Redfearn @ 2018-03-29  9:49 UTC (permalink / raw)
  To: Daniel Lezcano, Thomas Gleixner; +Cc: linux-mips, Matt Redfearn, linux-kernel

Several messages from the MIPS GIC driver include the text "GIC", "GIC
timer", etc, but the format is not standard. Add a pr_fmt of
"mips-gic-timer: " and reword the messages now that they will be
prefixed with the driver name.

Signed-off-by: Matt Redfearn <matt.redfearn@mips.com>
---

Changes in v2:
Rebase on v4.16-rc7

 drivers/clocksource/mips-gic-timer.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c
index 986b6796b631..54f8a331b53a 100644
--- a/drivers/clocksource/mips-gic-timer.c
+++ b/drivers/clocksource/mips-gic-timer.c
@@ -5,6 +5,9 @@
  *
  * Copyright (C) 2012 MIPS Technologies, Inc.  All rights reserved.
  */
+
+#define pr_fmt(fmt) "mips-gic-timer: " fmt
+
 #include <linux/clk.h>
 #include <linux/clockchips.h>
 #include <linux/cpu.h>
@@ -136,8 +139,7 @@ static int gic_clockevent_init(void)
 
 	ret = setup_percpu_irq(gic_timer_irq, &gic_compare_irqaction);
 	if (ret < 0) {
-		pr_err("GIC timer IRQ %d setup failed: %d\n",
-		       gic_timer_irq, ret);
+		pr_err("IRQ %d setup failed (%d)\n", gic_timer_irq, ret);
 		return ret;
 	}
 
@@ -176,7 +178,7 @@ static int __init __gic_clocksource_init(void)
 
 	ret = clocksource_register_hz(&gic_clocksource, gic_frequency);
 	if (ret < 0)
-		pr_warn("GIC: Unable to register clocksource\n");
+		pr_warn("Unable to register clocksource\n");
 
 	return ret;
 }
@@ -188,7 +190,7 @@ static int __init gic_clocksource_of_init(struct device_node *node)
 
 	if (!mips_gic_present() || !node->parent ||
 	    !of_device_is_compatible(node->parent, "mti,gic")) {
-		pr_warn("No DT definition for the mips gic driver\n");
+		pr_warn("No DT definition\n");
 		return -ENXIO;
 	}
 
@@ -196,7 +198,7 @@ static int __init gic_clocksource_of_init(struct device_node *node)
 	if (!IS_ERR(clk)) {
 		ret = clk_prepare_enable(clk);
 		if (ret < 0) {
-			pr_err("GIC failed to enable clock\n");
+			pr_err("Failed to enable clock\n");
 			clk_put(clk);
 			return ret;
 		}
@@ -204,12 +206,12 @@ static int __init gic_clocksource_of_init(struct device_node *node)
 		gic_frequency = clk_get_rate(clk);
 	} else if (of_property_read_u32(node, "clock-frequency",
 					&gic_frequency)) {
-		pr_err("GIC frequency not specified.\n");
+		pr_err("Frequency not specified\n");
 		return -EINVAL;
 	}
 	gic_timer_irq = irq_of_parse_and_map(node, 0);
 	if (!gic_timer_irq) {
-		pr_err("GIC timer IRQ not specified.\n");
+		pr_err("IRQ not specified\n");
 		return -EINVAL;
 	}
 
@@ -220,7 +222,7 @@ static int __init gic_clocksource_of_init(struct device_node *node)
 	ret = gic_clockevent_init();
 	if (!ret && !IS_ERR(clk)) {
 		if (clk_notifier_register(clk, &gic_clk_nb) < 0)
-			pr_warn("GIC: Unable to register clock notifier\n");
+			pr_warn("Unable to register clock notifier\n");
 	}
 
 	/* And finally start the counter */
-- 
2.7.4

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH v2] clocksource/drivers/mips-gic-timer: Add pr_fmt and reword pr_* messages
  2018-03-29  9:49 ` [PATCH v2] " Matt Redfearn
@ 2018-05-14  9:45   ` Matt Redfearn
  2018-05-14 12:49   ` Daniel Lezcano
  1 sibling, 0 replies; 4+ messages in thread
From: Matt Redfearn @ 2018-05-14  9:45 UTC (permalink / raw)
  To: Daniel Lezcano, Thomas Gleixner; +Cc: linux-mips, linux-kernel



On 29/03/18 10:49, Matt Redfearn wrote:
> Several messages from the MIPS GIC driver include the text "GIC", "GIC
> timer", etc, but the format is not standard. Add a pr_fmt of
> "mips-gic-timer: " and reword the messages now that they will be
> prefixed with the driver name.
> 
> Signed-off-by: Matt Redfearn <matt.redfearn@mips.com>


ping?

Thanks,
Matt

> ---
> 
> Changes in v2:
> Rebase on v4.16-rc7
> 
>   drivers/clocksource/mips-gic-timer.c | 18 ++++++++++--------
>   1 file changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c
> index 986b6796b631..54f8a331b53a 100644
> --- a/drivers/clocksource/mips-gic-timer.c
> +++ b/drivers/clocksource/mips-gic-timer.c
> @@ -5,6 +5,9 @@
>    *
>    * Copyright (C) 2012 MIPS Technologies, Inc.  All rights reserved.
>    */
> +
> +#define pr_fmt(fmt) "mips-gic-timer: " fmt
> +
>   #include <linux/clk.h>
>   #include <linux/clockchips.h>
>   #include <linux/cpu.h>
> @@ -136,8 +139,7 @@ static int gic_clockevent_init(void)
>   
>   	ret = setup_percpu_irq(gic_timer_irq, &gic_compare_irqaction);
>   	if (ret < 0) {
> -		pr_err("GIC timer IRQ %d setup failed: %d\n",
> -		       gic_timer_irq, ret);
> +		pr_err("IRQ %d setup failed (%d)\n", gic_timer_irq, ret);
>   		return ret;
>   	}
>   
> @@ -176,7 +178,7 @@ static int __init __gic_clocksource_init(void)
>   
>   	ret = clocksource_register_hz(&gic_clocksource, gic_frequency);
>   	if (ret < 0)
> -		pr_warn("GIC: Unable to register clocksource\n");
> +		pr_warn("Unable to register clocksource\n");
>   
>   	return ret;
>   }
> @@ -188,7 +190,7 @@ static int __init gic_clocksource_of_init(struct device_node *node)
>   
>   	if (!mips_gic_present() || !node->parent ||
>   	    !of_device_is_compatible(node->parent, "mti,gic")) {
> -		pr_warn("No DT definition for the mips gic driver\n");
> +		pr_warn("No DT definition\n");
>   		return -ENXIO;
>   	}
>   
> @@ -196,7 +198,7 @@ static int __init gic_clocksource_of_init(struct device_node *node)
>   	if (!IS_ERR(clk)) {
>   		ret = clk_prepare_enable(clk);
>   		if (ret < 0) {
> -			pr_err("GIC failed to enable clock\n");
> +			pr_err("Failed to enable clock\n");
>   			clk_put(clk);
>   			return ret;
>   		}
> @@ -204,12 +206,12 @@ static int __init gic_clocksource_of_init(struct device_node *node)
>   		gic_frequency = clk_get_rate(clk);
>   	} else if (of_property_read_u32(node, "clock-frequency",
>   					&gic_frequency)) {
> -		pr_err("GIC frequency not specified.\n");
> +		pr_err("Frequency not specified\n");
>   		return -EINVAL;
>   	}
>   	gic_timer_irq = irq_of_parse_and_map(node, 0);
>   	if (!gic_timer_irq) {
> -		pr_err("GIC timer IRQ not specified.\n");
> +		pr_err("IRQ not specified\n");
>   		return -EINVAL;
>   	}
>   
> @@ -220,7 +222,7 @@ static int __init gic_clocksource_of_init(struct device_node *node)
>   	ret = gic_clockevent_init();
>   	if (!ret && !IS_ERR(clk)) {
>   		if (clk_notifier_register(clk, &gic_clk_nb) < 0)
> -			pr_warn("GIC: Unable to register clock notifier\n");
> +			pr_warn("Unable to register clock notifier\n");
>   	}
>   
>   	/* And finally start the counter */
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH v2] clocksource/drivers/mips-gic-timer: Add pr_fmt and reword pr_* messages
  2018-03-29  9:49 ` [PATCH v2] " Matt Redfearn
  2018-05-14  9:45   ` Matt Redfearn
@ 2018-05-14 12:49   ` Daniel Lezcano
  1 sibling, 0 replies; 4+ messages in thread
From: Daniel Lezcano @ 2018-05-14 12:49 UTC (permalink / raw)
  To: Matt Redfearn; +Cc: Thomas Gleixner, linux-mips, linux-kernel

On Thu, Mar 29, 2018 at 10:49:03AM +0100, Matt Redfearn wrote:
> Several messages from the MIPS GIC driver include the text "GIC", "GIC
> timer", etc, but the format is not standard. Add a pr_fmt of
> "mips-gic-timer: " and reword the messages now that they will be
> prefixed with the driver name.
> 
> Signed-off-by: Matt Redfearn <matt.redfearn@mips.com>
> ---

Applied, thanks for the head up.

  -- Daniel

-- 

 <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

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2018-05-14 12:49 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-20 14:50 [PATCH] clocksource/drivers/mips-gic-timer: Add pr_fmt and reword pr_* messages Matt Redfearn
2018-03-29  9:49 ` [PATCH v2] " Matt Redfearn
2018-05-14  9:45   ` Matt Redfearn
2018-05-14 12:49   ` Daniel Lezcano

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).