linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 2/4] clocksource/drivers/arm_arch_timer: Remove unneeded pr_fmt macro
       [not found] ` <20190416124640.20058-1-daniel.lezcano@linaro.org>
@ 2019-04-16 12:46   ` Daniel Lezcano
  2019-04-16 12:46   ` [PATCH 3/4] clocksource/drivers/oxnas: Fix OX820 compatible Daniel Lezcano
  1 sibling, 0 replies; 3+ messages in thread
From: Daniel Lezcano @ 2019-04-16 12:46 UTC (permalink / raw)
  To: tglx
  Cc: Yangtao Li, Mark Rutland, linux-kernel,
	moderated list:ARM ARCHITECTED TIMER DRIVER, Marc Zyngier

From: Yangtao Li <tiny.windzz@gmail.com>

After this commit ded24019b6b6f(clocksource: arm_arch_timer: clean up
printk usage), the previous macro is redundant, so delete it.

And move the new macro to the previous position.

Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 drivers/clocksource/arm_arch_timer.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index aa4ec53281ce..ea373cfbcecb 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -9,7 +9,7 @@
  * published by the Free Software Foundation.
  */
 
-#define pr_fmt(fmt)	"arm_arch_timer: " fmt
+#define pr_fmt(fmt) 	"arch_timer: " fmt
 
 #include <linux/init.h>
 #include <linux/kernel.h>
@@ -33,9 +33,6 @@
 
 #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))
 
-- 
2.17.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

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

* [PATCH 3/4] clocksource/drivers/oxnas: Fix OX820 compatible
       [not found] ` <20190416124640.20058-1-daniel.lezcano@linaro.org>
  2019-04-16 12:46   ` [PATCH 2/4] clocksource/drivers/arm_arch_timer: Remove unneeded pr_fmt macro Daniel Lezcano
@ 2019-04-16 12:46   ` Daniel Lezcano
  2019-04-16 19:26     ` Daniel Golle
  1 sibling, 1 reply; 3+ messages in thread
From: Daniel Lezcano @ 2019-04-16 12:46 UTC (permalink / raw)
  To: tglx
  Cc: moderated list:ARM/OXNAS platform support,
	moderated list:ARM/OXNAS platform support, linux-kernel,
	Daniel Golle, Neil Armstrong

From: Neil Armstrong <narmstrong@baylibre.com>

The OX820 compatible is wrong is the driver, fix it.

Fixes: 2ea3401e2a84 ("clocksource/drivers/oxnas: Add OX820 compatible")
Reported-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 drivers/clocksource/timer-oxnas-rps.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clocksource/timer-oxnas-rps.c b/drivers/clocksource/timer-oxnas-rps.c
index eed6feff8b5f..30c6f4ce672b 100644
--- a/drivers/clocksource/timer-oxnas-rps.c
+++ b/drivers/clocksource/timer-oxnas-rps.c
@@ -296,4 +296,4 @@ static int __init oxnas_rps_timer_init(struct device_node *np)
 TIMER_OF_DECLARE(ox810se_rps,
 		       "oxsemi,ox810se-rps-timer", oxnas_rps_timer_init);
 TIMER_OF_DECLARE(ox820_rps,
-		       "oxsemi,ox820se-rps-timer", oxnas_rps_timer_init);
+		       "oxsemi,ox820-rps-timer", oxnas_rps_timer_init);
-- 
2.17.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

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

* Re: [PATCH 3/4] clocksource/drivers/oxnas: Fix OX820 compatible
  2019-04-16 12:46   ` [PATCH 3/4] clocksource/drivers/oxnas: Fix OX820 compatible Daniel Lezcano
@ 2019-04-16 19:26     ` Daniel Golle
  0 siblings, 0 replies; 3+ messages in thread
From: Daniel Golle @ 2019-04-16 19:26 UTC (permalink / raw)
  To: Daniel Lezcano
  Cc: tglx, moderated list:ARM/OXNAS platform support, linux-kernel,
	moderated list:ARM/OXNAS platform support, Neil Armstrong

Works great here

On Tue, Apr 16, 2019 at 02:46:39PM +0200, Daniel Lezcano wrote:
> From: Neil Armstrong <narmstrong@baylibre.com>
> 
> The OX820 compatible is wrong is the driver, fix it.
> 
> Fixes: 2ea3401e2a84 ("clocksource/drivers/oxnas: Add OX820 compatible")
> Reported-by: Daniel Golle <daniel@makrotopia.org>
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Tested-by: Daniel Golle <daniel@makrotopia.org>

> ---
>  drivers/clocksource/timer-oxnas-rps.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/clocksource/timer-oxnas-rps.c b/drivers/clocksource/timer-oxnas-rps.c
> index eed6feff8b5f..30c6f4ce672b 100644
> --- a/drivers/clocksource/timer-oxnas-rps.c
> +++ b/drivers/clocksource/timer-oxnas-rps.c
> @@ -296,4 +296,4 @@ static int __init oxnas_rps_timer_init(struct device_node *np)
>  TIMER_OF_DECLARE(ox810se_rps,
>  		       "oxsemi,ox810se-rps-timer", oxnas_rps_timer_init);
>  TIMER_OF_DECLARE(ox820_rps,
> -		       "oxsemi,ox820se-rps-timer", oxnas_rps_timer_init);
> +		       "oxsemi,ox820-rps-timer", oxnas_rps_timer_init);
> -- 
> 2.17.1
> 

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

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

end of thread, other threads:[~2019-04-16 19:26 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <92427592-507b-e280-01bf-763d795c8a2f@linaro.org>
     [not found] ` <20190416124640.20058-1-daniel.lezcano@linaro.org>
2019-04-16 12:46   ` [PATCH 2/4] clocksource/drivers/arm_arch_timer: Remove unneeded pr_fmt macro Daniel Lezcano
2019-04-16 12:46   ` [PATCH 3/4] clocksource/drivers/oxnas: Fix OX820 compatible Daniel Lezcano
2019-04-16 19:26     ` Daniel Golle

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).