diff options
Diffstat (limited to 'sound/oss')
| -rw-r--r-- | sound/oss/midibuf.c | 2 | ||||
| -rw-r--r-- | sound/oss/soundcard.c | 3 | ||||
| -rw-r--r-- | sound/oss/sys_timer.c | 3 | ||||
| -rw-r--r-- | sound/oss/uart6850.c | 3 |
4 files changed, 4 insertions, 7 deletions
diff --git a/sound/oss/midibuf.c b/sound/oss/midibuf.c index b2676fa3463..6982556ded5 100644 --- a/sound/oss/midibuf.c +++ b/sound/oss/midibuf.c @@ -50,7 +50,7 @@ static struct midi_parms parms[MAX_MIDI_DEV]; static void midi_poll(unsigned long dummy); -static struct timer_list poll_timer = TIMER_INITIALIZER(midi_poll, 0, 0); +static DEFINE_TIMER(poll_timer, midi_poll, 0, 0); static volatile int open_devs; static DEFINE_SPINLOCK(lock); diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c index a686be936af..95fa81e26de 100644 --- a/sound/oss/soundcard.c +++ b/sound/oss/soundcard.c @@ -681,8 +681,7 @@ static void do_sequencer_timer(unsigned long dummy) } -static struct timer_list seq_timer = - TIMER_INITIALIZER(do_sequencer_timer, 0, 0); +static DEFINE_TIMER(seq_timer, do_sequencer_timer, 0, 0); void request_sound_timer(int count) { diff --git a/sound/oss/sys_timer.c b/sound/oss/sys_timer.c index 6afe29b763b..c9d04518b17 100644 --- a/sound/oss/sys_timer.c +++ b/sound/oss/sys_timer.c @@ -28,8 +28,7 @@ static unsigned long prev_event_time; static void poll_def_tmr(unsigned long dummy); static DEFINE_SPINLOCK(lock); - -static struct timer_list def_tmr = TIMER_INITIALIZER(poll_def_tmr, 0, 0); +static DEFINE_TIMER(def_tmr, poll_def_tmr, 0, 0); static unsigned long tmr2ticks(int tmr_value) diff --git a/sound/oss/uart6850.c b/sound/oss/uart6850.c index be00cf12865..74ae75f9e2d 100644 --- a/sound/oss/uart6850.c +++ b/sound/oss/uart6850.c @@ -78,8 +78,7 @@ static void (*midi_input_intr) (int dev, unsigned char data); static void poll_uart6850(unsigned long dummy); -static struct timer_list uart6850_timer = - TIMER_INITIALIZER(poll_uart6850, 0, 0); +static DEFINE_TIMER(uart6850_timer, poll_uart6850, 0, 0); static void uart6850_input_loop(void) { |