mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
[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 <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
7c352bdf04
commit
8d06afab73
45 changed files with 62 additions and 89 deletions
|
|
@ -371,7 +371,7 @@ static int acsi_revalidate (struct gendisk *disk);
|
|||
/************************* End of Prototypes **************************/
|
||||
|
||||
|
||||
struct timer_list acsi_timer = TIMER_INITIALIZER(acsi_times_out, 0, 0);
|
||||
DEFINE_TIMER(acsi_timer, acsi_times_out, 0, 0);
|
||||
|
||||
|
||||
#ifdef CONFIG_ATARI_SLM
|
||||
|
|
|
|||
|
|
@ -268,7 +268,7 @@ static int slm_get_pagesize( int device, int *w, int *h );
|
|||
/************************* End of Prototypes **************************/
|
||||
|
||||
|
||||
static struct timer_list slm_timer = TIMER_INITIALIZER(slm_test_ready, 0, 0);
|
||||
static DEFINE_TIMER(slm_timer, slm_test_ready, 0, 0);
|
||||
|
||||
static struct file_operations slm_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
|
|
|
|||
|
|
@ -371,16 +371,10 @@ static int floppy_release( struct inode * inode, struct file * filp );
|
|||
|
||||
/************************* End of Prototypes **************************/
|
||||
|
||||
static struct timer_list motor_off_timer =
|
||||
TIMER_INITIALIZER(fd_motor_off_timer, 0, 0);
|
||||
static struct timer_list readtrack_timer =
|
||||
TIMER_INITIALIZER(fd_readtrack_check, 0, 0);
|
||||
|
||||
static struct timer_list timeout_timer =
|
||||
TIMER_INITIALIZER(fd_times_out, 0, 0);
|
||||
|
||||
static struct timer_list fd_timer =
|
||||
TIMER_INITIALIZER(check_change, 0, 0);
|
||||
static DEFINE_TIMER(motor_off_timer, fd_motor_off_timer, 0, 0);
|
||||
static DEFINE_TIMER(readtrack_timer, fd_readtrack_check, 0, 0);
|
||||
static DEFINE_TIMER(timeout_timer, fd_times_out, 0, 0);
|
||||
static DEFINE_TIMER(fd_timer, check_change, 0, 0);
|
||||
|
||||
static inline void start_motor_off_timer(void)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -628,7 +628,7 @@ static inline void debugt(const char *message) { }
|
|||
#endif /* DEBUGT */
|
||||
|
||||
typedef void (*timeout_fn) (unsigned long);
|
||||
static struct timer_list fd_timeout = TIMER_INITIALIZER(floppy_shutdown, 0, 0);
|
||||
static DEFINE_TIMER(fd_timeout, floppy_shutdown, 0, 0);
|
||||
|
||||
static const char *timeout_message;
|
||||
|
||||
|
|
@ -1012,7 +1012,7 @@ static void schedule_bh(void (*handler) (void))
|
|||
schedule_work(&floppy_work);
|
||||
}
|
||||
|
||||
static struct timer_list fd_timer = TIMER_INITIALIZER(NULL, 0, 0);
|
||||
static DEFINE_TIMER(fd_timer, NULL, 0, 0);
|
||||
|
||||
static void cancel_activity(void)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -99,8 +99,7 @@ static DECLARE_WAIT_QUEUE_HEAD(ps2esdi_int);
|
|||
static int no_int_yet;
|
||||
static int ps2esdi_drives;
|
||||
static u_short io_base;
|
||||
static struct timer_list esdi_timer =
|
||||
TIMER_INITIALIZER(ps2esdi_reset_timer, 0, 0);
|
||||
static DEFINE_TIMER(esdi_timer, ps2esdi_reset_timer, 0, 0);
|
||||
static int reset_status;
|
||||
static int ps2esdi_slot = -1;
|
||||
static int tp720esdi = 0; /* Is it Integrated ESDI of ThinkPad-720? */
|
||||
|
|
|
|||
Loading…
Reference in a new issue