clocksource: Use a plain u64 instead of cycle_t
There is no point in having an extra type for extra confusion. u64 is unambiguous. Conversion was done with the following coccinelle script: @rem@ @@ -typedef u64 cycle_t; @fix@ typedef cycle_t; @@ -cycle_t +u64 Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: John Stultz <john.stultz@linaro.org>
这个提交包含在:
@@ -27,7 +27,7 @@ struct txx9_clocksource {
|
||||
struct txx9_tmr_reg __iomem *tmrptr;
|
||||
};
|
||||
|
||||
static cycle_t txx9_cs_read(struct clocksource *cs)
|
||||
static u64 txx9_cs_read(struct clocksource *cs)
|
||||
{
|
||||
struct txx9_clocksource *txx9_cs =
|
||||
container_of(cs, struct txx9_clocksource, cs);
|
||||
|
@@ -25,9 +25,9 @@
|
||||
|
||||
#include <asm/sibyte/sb1250.h>
|
||||
|
||||
static cycle_t bcm1480_hpt_read(struct clocksource *cs)
|
||||
static u64 bcm1480_hpt_read(struct clocksource *cs)
|
||||
{
|
||||
return (cycle_t) __raw_readq(IOADDR(A_SCD_ZBBUS_CYCLE_COUNT));
|
||||
return (u64) __raw_readq(IOADDR(A_SCD_ZBBUS_CYCLE_COUNT));
|
||||
}
|
||||
|
||||
struct clocksource bcm1480_clocksource = {
|
||||
|
@@ -22,7 +22,7 @@
|
||||
#include <asm/dec/ioasic.h>
|
||||
#include <asm/dec/ioasic_addrs.h>
|
||||
|
||||
static cycle_t dec_ioasic_hpt_read(struct clocksource *cs)
|
||||
static u64 dec_ioasic_hpt_read(struct clocksource *cs)
|
||||
{
|
||||
return ioasic_read(IO_REG_FCTR);
|
||||
}
|
||||
|
@@ -11,7 +11,7 @@
|
||||
|
||||
#include <asm/time.h>
|
||||
|
||||
static cycle_t c0_hpt_read(struct clocksource *cs)
|
||||
static u64 c0_hpt_read(struct clocksource *cs)
|
||||
{
|
||||
return read_c0_count();
|
||||
}
|
||||
|
@@ -30,7 +30,7 @@
|
||||
* The HPT is free running from SB1250_HPT_VALUE down to 0 then starts over
|
||||
* again.
|
||||
*/
|
||||
static inline cycle_t sb1250_hpt_get_cycles(void)
|
||||
static inline u64 sb1250_hpt_get_cycles(void)
|
||||
{
|
||||
unsigned int count;
|
||||
void __iomem *addr;
|
||||
@@ -41,7 +41,7 @@ static inline cycle_t sb1250_hpt_get_cycles(void)
|
||||
return SB1250_HPT_VALUE - count;
|
||||
}
|
||||
|
||||
static cycle_t sb1250_hpt_read(struct clocksource *cs)
|
||||
static u64 sb1250_hpt_read(struct clocksource *cs)
|
||||
{
|
||||
return sb1250_hpt_get_cycles();
|
||||
}
|
||||
|
在新工单中引用
屏蔽一个用户