clocksource: Fix type confusion for clocksource_mmio_readX_Y
authorXiubo Li <Li.Xiubo@freescale.com>
Wed, 23 Apr 2014 02:11:59 +0000 (10:11 +0800)
committerDaniel Lezcano <daniel.lezcano@linaro.org>
Fri, 23 May 2014 07:19:39 +0000 (09:19 +0200)
The types' definations are:
   o  cycle_t       -> u64
   o  readl_relaxed -> u32
   o  readw_relaxed -> u16

So let clocksource_mmio_readX_Ys return a cast to cycle_t, though
this maybe look reduntant sometimes, it make sense and they will be
more readable and less confusion...

This patch clarifies the functions type and fix it.

Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
drivers/clocksource/mmio.c

index c0e25125a55e027a0e1cb48e67fa7558918c5739..19a6b3f4d9cf02c1b23549d3b5a599057e6cf69b 100644 (file)
@@ -22,22 +22,22 @@ static inline struct clocksource_mmio *to_mmio_clksrc(struct clocksource *c)
 
 cycle_t clocksource_mmio_readl_up(struct clocksource *c)
 {
-       return readl_relaxed(to_mmio_clksrc(c)->reg);
+       return (cycle_t)readl_relaxed(to_mmio_clksrc(c)->reg);
 }
 
 cycle_t clocksource_mmio_readl_down(struct clocksource *c)
 {
-       return ~readl_relaxed(to_mmio_clksrc(c)->reg);
+       return ~(cycle_t)readl_relaxed(to_mmio_clksrc(c)->reg);
 }
 
 cycle_t clocksource_mmio_readw_up(struct clocksource *c)
 {
-       return readw_relaxed(to_mmio_clksrc(c)->reg);
+       return (cycle_t)readw_relaxed(to_mmio_clksrc(c)->reg);
 }
 
 cycle_t clocksource_mmio_readw_down(struct clocksource *c)
 {
-       return ~(unsigned)readw_relaxed(to_mmio_clksrc(c)->reg);
+       return ~(cycle_t)readw_relaxed(to_mmio_clksrc(c)->reg);
 }
 
 /**