diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-06-17 10:30:03 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2016-06-17 10:31:19 -0400 |
commit | cfecf1afd3a7412df810c2b98c77744f90c13e24 (patch) | |
tree | b2205a16790d9de2648d46f92504dfe8d3f927f2 | |
parent | 960a581e22d93a784db843110ad1e6249c1542a5 (diff) |
sound: oss: avoid time_t usage
We want to remove all time_t users from the kernel because of
y2038 compatibility. This particular instance does not even
use time_t to store a seconds value, so we can simply use
'unsigned int', which seems more fitting anywhere.
The same code is used in two OSS files.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/oss/sound_timer.c | 2 | ||||
-rw-r--r-- | sound/oss/sys_timer.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/oss/sound_timer.c b/sound/oss/sound_timer.c index 8021c85f076d..3a444a6f10eb 100644 --- a/sound/oss/sound_timer.c +++ b/sound/oss/sound_timer.c | |||
@@ -17,7 +17,7 @@ | |||
17 | #include "sound_config.h" | 17 | #include "sound_config.h" |
18 | 18 | ||
19 | static volatile int initialized, opened, tmr_running; | 19 | static volatile int initialized, opened, tmr_running; |
20 | static volatile time_t tmr_offs, tmr_ctr; | 20 | static volatile unsigned int tmr_offs, tmr_ctr; |
21 | static volatile unsigned long ticks_offs; | 21 | static volatile unsigned long ticks_offs; |
22 | static volatile int curr_tempo, curr_timebase; | 22 | static volatile int curr_tempo, curr_timebase; |
23 | static volatile unsigned long curr_ticks; | 23 | static volatile unsigned long curr_ticks; |
diff --git a/sound/oss/sys_timer.c b/sound/oss/sys_timer.c index 2226dda0eff0..d17019d25b99 100644 --- a/sound/oss/sys_timer.c +++ b/sound/oss/sys_timer.c | |||
@@ -19,7 +19,7 @@ | |||
19 | #include "sound_config.h" | 19 | #include "sound_config.h" |
20 | 20 | ||
21 | static volatile int opened, tmr_running; | 21 | static volatile int opened, tmr_running; |
22 | static volatile time_t tmr_offs, tmr_ctr; | 22 | static volatile unsigned int tmr_offs, tmr_ctr; |
23 | static volatile unsigned long ticks_offs; | 23 | static volatile unsigned long ticks_offs; |
24 | static volatile int curr_tempo, curr_timebase; | 24 | static volatile int curr_tempo, curr_timebase; |
25 | static volatile unsigned long curr_ticks; | 25 | static volatile unsigned long curr_ticks; |