lkml.org 
[lkml]   [2014]   [Dec]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] clocksource: kona: fix __iomem annotation
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) {
>



\
 
 \ /
  Last update: 2014-12-09 00:01    [W:0.025 / U:0.256 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site