> Subject: Re: [PATCHv2 1/2] clocksource: fix type confusion for > clocksource_mmio_readX_Y > > On 05/19/2014 04:35 AM, [email protected] wrote: > > Hi, > > > > I'd like to know the status about this patch series... > > :） > > I think the patches are ok. I have them in my queue for 3.16. >
That's nice. Thanks, BRs Xiubo > >> -----Original Message----- > >> From: Xiubo Li [mailto:[email protected]] > >> Sent: Wednesday, April 23, 2014 10:12 AM > >> To: [email protected]; [email protected]; linux- > >> [email protected] > >> Cc: Xiubo Li-B47053 > >> Subject: [PATCHv2 1/2] clocksource: fix type confusion for > >> clocksource_mmio_readX_Y > >> > >> 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 <[email protected]> > >> Cc: Daniel Lezcano <[email protected]> > >> --- > >> drivers/clocksource/mmio.c | 8 ++++---- > >> 1 file changed, 4 insertions(+), 4 deletions(-) > >> > >> diff --git a/drivers/clocksource/mmio.c b/drivers/clocksource/mmio.c > >> index c0e2512..19a6b3f 100644 > >> --- a/drivers/clocksource/mmio.c > >> +++ b/drivers/clocksource/mmio.c > >> @@ -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); > >> } > >> > >> /** > >> -- > >> 1.8.4 > > > > > -- > <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
