* [PATCH] clocksource: kona: fix __iomem annotation
@ 2014-12-08 21:42 Olof Johansson
2014-12-08 22:37 ` Florian Fainelli
0 siblings, 1 reply; 2+ messages in thread
From: Olof Johansson @ 2014-12-08 21:42 UTC (permalink / raw)
To: daniel.lezcano, tglx
Cc: f.fainelli, bcm-kernel-feedback-list, linux-kernel,
Olof Johansson
It makes no sense to hide the __iomem annotation from the function
that uses it, especially since it causes a sparse warning:
drivers/clocksource/bcm_kona_timer.c:118:38: warning: incorrect type in argument 1 (different address spaces)
drivers/clocksource/bcm_kona_timer.c:118:38: expected void *timer_base
drivers/clocksource/bcm_kona_timer.c:118:38: got void [noderef] <asn:2>*static [toplevel] tmr_regs
Signed-off-by: Olof Johansson <olof@lixom.net>
---
drivers/clocksource/bcm_kona_timer.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/clocksource/bcm_kona_timer.c b/drivers/clocksource/bcm_kona_timer.c
index 0595dc6..f1e33d0 100644
--- a/drivers/clocksource/bcm_kona_timer.c
+++ b/drivers/clocksource/bcm_kona_timer.c
@@ -68,9 +68,8 @@ static void kona_timer_disable_and_clear(void __iomem *base)
}
static void
-kona_timer_get_counter(void *timer_base, uint32_t *msw, uint32_t *lsw)
+kona_timer_get_counter(void __iomem *timer_base, uint32_t *msw, uint32_t *lsw)
{
- void __iomem *base = IOMEM(timer_base);
int loop_limit = 4;
/*
@@ -86,9 +85,9 @@ kona_timer_get_counter(void *timer_base, uint32_t *msw, uint32_t *lsw)
*/
while (--loop_limit) {
- *msw = readl(base + KONA_GPTIMER_STCHI_OFFSET);
- *lsw = readl(base + KONA_GPTIMER_STCLO_OFFSET);
- if (*msw == readl(base + KONA_GPTIMER_STCHI_OFFSET))
+ *msw = readl(timer_base + KONA_GPTIMER_STCHI_OFFSET);
+ *lsw = readl(timer_base + KONA_GPTIMER_STCLO_OFFSET);
+ if (*msw == readl(timer_base + KONA_GPTIMER_STCHI_OFFSET))
break;
}
if (!loop_limit) {
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] clocksource: kona: fix __iomem annotation
2014-12-08 21:42 [PATCH] clocksource: kona: fix __iomem annotation Olof Johansson
@ 2014-12-08 22:37 ` Florian Fainelli
0 siblings, 0 replies; 2+ messages in thread
From: Florian Fainelli @ 2014-12-08 22:37 UTC (permalink / raw)
To: Olof Johansson, daniel.lezcano, tglx
Cc: bcm-kernel-feedback-list, linux-kernel
On 08/12/14 13:42, Olof Johansson wrote:
> It makes no sense to hide the __iomem annotation from the function
> that uses it, especially since it causes a sparse warning:
>
> drivers/clocksource/bcm_kona_timer.c:118:38: warning: incorrect type in argument 1 (different address spaces)
> drivers/clocksource/bcm_kona_timer.c:118:38: expected void *timer_base
> drivers/clocksource/bcm_kona_timer.c:118:38: got void [noderef] <asn:2>*static [toplevel] tmr_regs
>
> Signed-off-by: Olof Johansson <olof@lixom.net>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
> ---
> drivers/clocksource/bcm_kona_timer.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/clocksource/bcm_kona_timer.c b/drivers/clocksource/bcm_kona_timer.c
> index 0595dc6..f1e33d0 100644
> --- a/drivers/clocksource/bcm_kona_timer.c
> +++ b/drivers/clocksource/bcm_kona_timer.c
> @@ -68,9 +68,8 @@ static void kona_timer_disable_and_clear(void __iomem *base)
> }
>
> static void
> -kona_timer_get_counter(void *timer_base, uint32_t *msw, uint32_t *lsw)
> +kona_timer_get_counter(void __iomem *timer_base, uint32_t *msw, uint32_t *lsw)
> {
> - void __iomem *base = IOMEM(timer_base);
> int loop_limit = 4;
>
> /*
> @@ -86,9 +85,9 @@ kona_timer_get_counter(void *timer_base, uint32_t *msw, uint32_t *lsw)
> */
>
> while (--loop_limit) {
> - *msw = readl(base + KONA_GPTIMER_STCHI_OFFSET);
> - *lsw = readl(base + KONA_GPTIMER_STCLO_OFFSET);
> - if (*msw == readl(base + KONA_GPTIMER_STCHI_OFFSET))
> + *msw = readl(timer_base + KONA_GPTIMER_STCHI_OFFSET);
> + *lsw = readl(timer_base + KONA_GPTIMER_STCLO_OFFSET);
> + if (*msw == readl(timer_base + KONA_GPTIMER_STCHI_OFFSET))
> break;
> }
> if (!loop_limit) {
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-12-08 22:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-08 21:42 [PATCH] clocksource: kona: fix __iomem annotation Olof Johansson
2014-12-08 22:37 ` Florian Fainelli
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.