aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/clocksource/arc_timer.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2016-12-21 14:32:01 -0500
committerThomas Gleixner <tglx@linutronix.de>2016-12-25 05:04:12 -0500
commita5a1d1c2914b5316924c7893eb683a5420ebd3be (patch)
tree9078b8a179031e7e8b320e1c69f182cc285e7b5d /drivers/clocksource/arc_timer.c
parent7c0f6ba682b9c7632072ffbedf8d328c8f3c42ba (diff)
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>
Diffstat (limited to 'drivers/clocksource/arc_timer.c')
-rw-r--r--drivers/clocksource/arc_timer.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/clocksource/arc_timer.c b/drivers/clocksource/arc_timer.c
index a49748d826c0..3ea46343024f 100644
--- a/drivers/clocksource/arc_timer.c
+++ b/drivers/clocksource/arc_timer.c
@@ -56,7 +56,7 @@ static int noinline arc_get_timer_clk(struct device_node *node)
56 56
57#ifdef CONFIG_ARC_TIMERS_64BIT 57#ifdef CONFIG_ARC_TIMERS_64BIT
58 58
59static cycle_t arc_read_gfrc(struct clocksource *cs) 59static u64 arc_read_gfrc(struct clocksource *cs)
60{ 60{
61 unsigned long flags; 61 unsigned long flags;
62 u32 l, h; 62 u32 l, h;
@@ -71,7 +71,7 @@ static cycle_t arc_read_gfrc(struct clocksource *cs)
71 71
72 local_irq_restore(flags); 72 local_irq_restore(flags);
73 73
74 return (((cycle_t)h) << 32) | l; 74 return (((u64)h) << 32) | l;
75} 75}
76 76
77static struct clocksource arc_counter_gfrc = { 77static struct clocksource arc_counter_gfrc = {
@@ -105,7 +105,7 @@ CLOCKSOURCE_OF_DECLARE(arc_gfrc, "snps,archs-timer-gfrc", arc_cs_setup_gfrc);
105#define AUX_RTC_LOW 0x104 105#define AUX_RTC_LOW 0x104
106#define AUX_RTC_HIGH 0x105 106#define AUX_RTC_HIGH 0x105
107 107
108static cycle_t arc_read_rtc(struct clocksource *cs) 108static u64 arc_read_rtc(struct clocksource *cs)
109{ 109{
110 unsigned long status; 110 unsigned long status;
111 u32 l, h; 111 u32 l, h;
@@ -122,7 +122,7 @@ static cycle_t arc_read_rtc(struct clocksource *cs)
122 status = read_aux_reg(AUX_RTC_CTRL); 122 status = read_aux_reg(AUX_RTC_CTRL);
123 } while (!(status & _BITUL(31))); 123 } while (!(status & _BITUL(31)));
124 124
125 return (((cycle_t)h) << 32) | l; 125 return (((u64)h) << 32) | l;
126} 126}
127 127
128static struct clocksource arc_counter_rtc = { 128static struct clocksource arc_counter_rtc = {
@@ -166,9 +166,9 @@ CLOCKSOURCE_OF_DECLARE(arc_rtc, "snps,archs-timer-rtc", arc_cs_setup_rtc);
166 * 32bit TIMER1 to keep counting monotonically and wraparound 166 * 32bit TIMER1 to keep counting monotonically and wraparound
167 */ 167 */
168 168
169static cycle_t arc_read_timer1(struct clocksource *cs) 169static u64 arc_read_timer1(struct clocksource *cs)
170{ 170{
171 return (cycle_t) read_aux_reg(ARC_REG_TIMER1_CNT); 171 return (u64) read_aux_reg(ARC_REG_TIMER1_CNT);
172} 172}
173 173
174static struct clocksource arc_counter_timer1 = { 174static struct clocksource arc_counter_timer1 = {