[PATCH] timer initialization cleanup: DEFINE_TIMER
Clean up timer initialization by introducing DEFINE_TIMER a'la DEFINE_SPINLOCK. Build and boot-tested on x86. A similar patch has been been in the -RT tree for some time. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:

committad av
Linus Torvalds

förälder
7c352bdf04
incheckning
8d06afab73
@@ -297,7 +297,7 @@ static char azt_auto_eject = AZT_AUTO_EJECT;
|
||||
|
||||
static int AztTimeout, AztTries;
|
||||
static DECLARE_WAIT_QUEUE_HEAD(azt_waitq);
|
||||
static struct timer_list delay_timer = TIMER_INITIALIZER(NULL, 0, 0);
|
||||
static DEFINE_TIMER(delay_timer, NULL, 0, 0);
|
||||
|
||||
static struct azt_DiskInfo DiskInfo;
|
||||
static struct azt_Toc Toc[MAX_TRACKS];
|
||||
|
@@ -146,7 +146,7 @@ static int AudioStart_f;
|
||||
static int AudioEnd_m;
|
||||
static int AudioEnd_f;
|
||||
|
||||
static struct timer_list gscd_timer = TIMER_INITIALIZER(NULL, 0, 0);
|
||||
static DEFINE_TIMER(gscd_timer, NULL, 0, 0);
|
||||
static DEFINE_SPINLOCK(gscd_lock);
|
||||
static struct request_queue *gscd_queue;
|
||||
|
||||
|
@@ -264,7 +264,7 @@ static inline int flag_low(int flag, unsigned long timeout)
|
||||
static int sleep_timeout; /* max # of ticks to sleep */
|
||||
static DECLARE_WAIT_QUEUE_HEAD(waitq);
|
||||
static void sleep_timer(unsigned long data);
|
||||
static struct timer_list delay_timer = TIMER_INITIALIZER(sleep_timer, 0, 0);
|
||||
static DEFINE_TIMER(delay_timer, sleep_timer, 0, 0);
|
||||
static DEFINE_SPINLOCK(optcd_lock);
|
||||
static struct request_queue *opt_queue;
|
||||
|
||||
|
@@ -742,13 +742,10 @@ static struct sbpcd_drive *current_drive = D_S;
|
||||
unsigned long cli_sti; /* for saving the processor flags */
|
||||
#endif
|
||||
/*==========================================================================*/
|
||||
static struct timer_list delay_timer =
|
||||
TIMER_INITIALIZER(mark_timeout_delay, 0, 0);
|
||||
static struct timer_list data_timer =
|
||||
TIMER_INITIALIZER(mark_timeout_data, 0, 0);
|
||||
static DEFINE_TIMER(delay_timer, mark_timeout_delay, 0, 0);
|
||||
static DEFINE_TIMER(data_timer, mark_timeout_data, 0, 0);
|
||||
#if 0
|
||||
static struct timer_list audio_timer =
|
||||
TIMER_INITIALIZER(mark_timeout_audio, 0, 0);
|
||||
static DEFINE_TIMER(audio_timer, mark_timeout_audio, 0, 0);
|
||||
#endif
|
||||
/*==========================================================================*/
|
||||
/*
|
||||
|
@@ -151,7 +151,7 @@ static struct sjcd_stat statistic;
|
||||
/*
|
||||
* Timer.
|
||||
*/
|
||||
static struct timer_list sjcd_delay_timer = TIMER_INITIALIZER(NULL, 0, 0);
|
||||
static DEFINE_TIMER(sjcd_delay_timer, NULL, 0, 0);
|
||||
|
||||
#define SJCD_SET_TIMER( func, tmout ) \
|
||||
( sjcd_delay_timer.expires = jiffies+tmout, \
|
||||
|
Referens i nytt ärende
Block a user