diff options
author | Kees Cook <keescook@chromium.org> | 2017-10-04 19:27:04 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2017-10-05 09:01:20 -0400 |
commit | 1d27e3e2252ba9d949ca82fbdb73cde102cb2067 (patch) | |
tree | d2818195a29dc90bd6dcc0a432a6480267cc926a | |
parent | 1ff97897454b9a59edc7cf2cf2d95586b1e7a2cf (diff) |
timer: Remove expires and data arguments from DEFINE_TIMER
Drop the arguments from the macro and adjust all callers with the
following script:
perl -pi -e 's/DEFINE_TIMER\((.*), 0, 0\);/DEFINE_TIMER($1);/g;' \
$(git grep DEFINE_TIMER | cut -d: -f1 | sort -u | grep -v timer.h)
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> # for m68k parts
Acked-by: Guenter Roeck <linux@roeck-us.net> # for watchdog parts
Acked-by: David S. Miller <davem@davemloft.net> # for networking parts
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Kalle Valo <kvalo@codeaurora.org> # for wireless parts
Acked-by: Arnd Bergmann <arnd@arndb.de>
Cc: linux-mips@linux-mips.org
Cc: Petr Mladek <pmladek@suse.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Lai Jiangshan <jiangshanlai@gmail.com>
Cc: Sebastian Reichel <sre@kernel.org>
Cc: Kalle Valo <kvalo@qca.qualcomm.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: linux1394-devel@lists.sourceforge.net
Cc: Chris Metcalf <cmetcalf@mellanox.com>
Cc: linux-s390@vger.kernel.org
Cc: linux-wireless@vger.kernel.org
Cc: "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>
Cc: Wim Van Sebroeck <wim@iguana.be>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Ursula Braun <ubraun@linux.vnet.ibm.com>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Harish Patil <harish.patil@cavium.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: Michael Reed <mdr@sgi.com>
Cc: Manish Chopra <manish.chopra@cavium.com>
Cc: Len Brown <len.brown@intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linux-pm@vger.kernel.org
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Julian Wiedmann <jwi@linux.vnet.ibm.com>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Mark Gross <mark.gross@intel.com>
Cc: linux-watchdog@vger.kernel.org
Cc: linux-scsi@vger.kernel.org
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Stefan Richter <stefanr@s5r6.in-berlin.de>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: netdev@vger.kernel.org
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Link: https://lkml.kernel.org/r/1507159627-127660-11-git-send-email-keescook@chromium.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
47 files changed, 54 insertions, 54 deletions
diff --git a/arch/arm/mach-ixp4xx/dsmg600-setup.c b/arch/arm/mach-ixp4xx/dsmg600-setup.c index b3bd0e137f6d..b3689a141ec6 100644 --- a/arch/arm/mach-ixp4xx/dsmg600-setup.c +++ b/arch/arm/mach-ixp4xx/dsmg600-setup.c | |||
@@ -174,7 +174,7 @@ static int power_button_countdown; | |||
174 | #define PBUTTON_HOLDDOWN_COUNT 4 /* 2 secs */ | 174 | #define PBUTTON_HOLDDOWN_COUNT 4 /* 2 secs */ |
175 | 175 | ||
176 | static void dsmg600_power_handler(unsigned long data); | 176 | static void dsmg600_power_handler(unsigned long data); |
177 | static DEFINE_TIMER(dsmg600_power_timer, dsmg600_power_handler, 0, 0); | 177 | static DEFINE_TIMER(dsmg600_power_timer, dsmg600_power_handler); |
178 | 178 | ||
179 | static void dsmg600_power_handler(unsigned long data) | 179 | static void dsmg600_power_handler(unsigned long data) |
180 | { | 180 | { |
diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c index 4e0f762bc651..562d05f9888e 100644 --- a/arch/arm/mach-ixp4xx/nas100d-setup.c +++ b/arch/arm/mach-ixp4xx/nas100d-setup.c | |||
@@ -197,7 +197,7 @@ static int power_button_countdown; | |||
197 | #define PBUTTON_HOLDDOWN_COUNT 4 /* 2 secs */ | 197 | #define PBUTTON_HOLDDOWN_COUNT 4 /* 2 secs */ |
198 | 198 | ||
199 | static void nas100d_power_handler(unsigned long data); | 199 | static void nas100d_power_handler(unsigned long data); |
200 | static DEFINE_TIMER(nas100d_power_timer, nas100d_power_handler, 0, 0); | 200 | static DEFINE_TIMER(nas100d_power_timer, nas100d_power_handler); |
201 | 201 | ||
202 | static void nas100d_power_handler(unsigned long data) | 202 | static void nas100d_power_handler(unsigned long data) |
203 | { | 203 | { |
diff --git a/arch/m68k/amiga/amisound.c b/arch/m68k/amiga/amisound.c index 90a60d758f8b..a23f48181fd6 100644 --- a/arch/m68k/amiga/amisound.c +++ b/arch/m68k/amiga/amisound.c | |||
@@ -66,7 +66,7 @@ void __init amiga_init_sound(void) | |||
66 | } | 66 | } |
67 | 67 | ||
68 | static void nosound( unsigned long ignored ); | 68 | static void nosound( unsigned long ignored ); |
69 | static DEFINE_TIMER(sound_timer, nosound, 0, 0); | 69 | static DEFINE_TIMER(sound_timer, nosound); |
70 | 70 | ||
71 | void amiga_mksound( unsigned int hz, unsigned int ticks ) | 71 | void amiga_mksound( unsigned int hz, unsigned int ticks ) |
72 | { | 72 | { |
diff --git a/arch/m68k/mac/macboing.c b/arch/m68k/mac/macboing.c index ffaa1f6439ae..9a52aff183d0 100644 --- a/arch/m68k/mac/macboing.c +++ b/arch/m68k/mac/macboing.c | |||
@@ -56,7 +56,7 @@ static void ( *mac_special_bell )( unsigned int, unsigned int, unsigned int ); | |||
56 | /* | 56 | /* |
57 | * our timer to start/continue/stop the bell | 57 | * our timer to start/continue/stop the bell |
58 | */ | 58 | */ |
59 | static DEFINE_TIMER(mac_sound_timer, mac_nosound, 0, 0); | 59 | static DEFINE_TIMER(mac_sound_timer, mac_nosound); |
60 | 60 | ||
61 | /* | 61 | /* |
62 | * Sort of initialize the sound chip (called from mac_mksound on the first | 62 | * Sort of initialize the sound chip (called from mac_mksound on the first |
diff --git a/arch/mips/mti-malta/malta-display.c b/arch/mips/mti-malta/malta-display.c index ac813158b9b8..063de44675ce 100644 --- a/arch/mips/mti-malta/malta-display.c +++ b/arch/mips/mti-malta/malta-display.c | |||
@@ -37,7 +37,7 @@ void mips_display_message(const char *str) | |||
37 | } | 37 | } |
38 | 38 | ||
39 | static void scroll_display_message(unsigned long unused); | 39 | static void scroll_display_message(unsigned long unused); |
40 | static DEFINE_TIMER(mips_scroll_timer, scroll_display_message, 0, 0); | 40 | static DEFINE_TIMER(mips_scroll_timer, scroll_display_message); |
41 | 41 | ||
42 | static void scroll_display_message(unsigned long unused) | 42 | static void scroll_display_message(unsigned long unused) |
43 | { | 43 | { |
diff --git a/arch/parisc/kernel/pdc_cons.c b/arch/parisc/kernel/pdc_cons.c index 10a5ae9553fd..27a2dd616a7d 100644 --- a/arch/parisc/kernel/pdc_cons.c +++ b/arch/parisc/kernel/pdc_cons.c | |||
@@ -92,7 +92,7 @@ static int pdc_console_setup(struct console *co, char *options) | |||
92 | #define PDC_CONS_POLL_DELAY (30 * HZ / 1000) | 92 | #define PDC_CONS_POLL_DELAY (30 * HZ / 1000) |
93 | 93 | ||
94 | static void pdc_console_poll(unsigned long unused); | 94 | static void pdc_console_poll(unsigned long unused); |
95 | static DEFINE_TIMER(pdc_console_timer, pdc_console_poll, 0, 0); | 95 | static DEFINE_TIMER(pdc_console_timer, pdc_console_poll); |
96 | static struct tty_port tty_port; | 96 | static struct tty_port tty_port; |
97 | 97 | ||
98 | static int pdc_console_tty_open(struct tty_struct *tty, struct file *filp) | 98 | static int pdc_console_tty_open(struct tty_struct *tty, struct file *filp) |
diff --git a/arch/s390/mm/cmm.c b/arch/s390/mm/cmm.c index 829c63dbc81a..2dbdcd85b68f 100644 --- a/arch/s390/mm/cmm.c +++ b/arch/s390/mm/cmm.c | |||
@@ -56,7 +56,7 @@ static DEFINE_SPINLOCK(cmm_lock); | |||
56 | 56 | ||
57 | static struct task_struct *cmm_thread_ptr; | 57 | static struct task_struct *cmm_thread_ptr; |
58 | static DECLARE_WAIT_QUEUE_HEAD(cmm_thread_wait); | 58 | static DECLARE_WAIT_QUEUE_HEAD(cmm_thread_wait); |
59 | static DEFINE_TIMER(cmm_timer, NULL, 0, 0); | 59 | static DEFINE_TIMER(cmm_timer, NULL); |
60 | 60 | ||
61 | static void cmm_timer_fn(unsigned long); | 61 | static void cmm_timer_fn(unsigned long); |
62 | static void cmm_set_timer(void); | 62 | static void cmm_set_timer(void); |
diff --git a/drivers/atm/idt77105.c b/drivers/atm/idt77105.c index 082aa02abc57..57af9fd198e4 100644 --- a/drivers/atm/idt77105.c +++ b/drivers/atm/idt77105.c | |||
@@ -49,8 +49,8 @@ static void idt77105_stats_timer_func(unsigned long); | |||
49 | static void idt77105_restart_timer_func(unsigned long); | 49 | static void idt77105_restart_timer_func(unsigned long); |
50 | 50 | ||
51 | 51 | ||
52 | static DEFINE_TIMER(stats_timer, idt77105_stats_timer_func, 0, 0); | 52 | static DEFINE_TIMER(stats_timer, idt77105_stats_timer_func); |
53 | static DEFINE_TIMER(restart_timer, idt77105_restart_timer_func, 0, 0); | 53 | static DEFINE_TIMER(restart_timer, idt77105_restart_timer_func); |
54 | static int start_timer = 1; | 54 | static int start_timer = 1; |
55 | static struct idt77105_priv *idt77105_all = NULL; | 55 | static struct idt77105_priv *idt77105_all = NULL; |
56 | 56 | ||
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c index fc72b763fdd7..ad6b582c268e 100644 --- a/drivers/atm/iphase.c +++ b/drivers/atm/iphase.c | |||
@@ -76,7 +76,7 @@ static IADEV *ia_dev[8]; | |||
76 | static struct atm_dev *_ia_dev[8]; | 76 | static struct atm_dev *_ia_dev[8]; |
77 | static int iadev_count; | 77 | static int iadev_count; |
78 | static void ia_led_timer(unsigned long arg); | 78 | static void ia_led_timer(unsigned long arg); |
79 | static DEFINE_TIMER(ia_timer, ia_led_timer, 0, 0); | 79 | static DEFINE_TIMER(ia_timer, ia_led_timer); |
80 | static int IA_TX_BUF = DFL_TX_BUFFERS, IA_TX_BUF_SZ = DFL_TX_BUF_SZ; | 80 | static int IA_TX_BUF = DFL_TX_BUFFERS, IA_TX_BUF_SZ = DFL_TX_BUF_SZ; |
81 | static int IA_RX_BUF = DFL_RX_BUFFERS, IA_RX_BUF_SZ = DFL_RX_BUF_SZ; | 81 | static int IA_RX_BUF = DFL_RX_BUFFERS, IA_RX_BUF_SZ = DFL_RX_BUF_SZ; |
82 | static uint IADebugFlag = /* IF_IADBG_ERR | IF_IADBG_CBR| IF_IADBG_INIT_ADAPTER | 82 | static uint IADebugFlag = /* IF_IADBG_ERR | IF_IADBG_CBR| IF_IADBG_INIT_ADAPTER |
diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c index 92da886180aa..ae596e55bcb6 100644 --- a/drivers/block/ataflop.c +++ b/drivers/block/ataflop.c | |||
@@ -373,10 +373,10 @@ static void floppy_release(struct gendisk *disk, fmode_t mode); | |||
373 | 373 | ||
374 | /************************* End of Prototypes **************************/ | 374 | /************************* End of Prototypes **************************/ |
375 | 375 | ||
376 | static DEFINE_TIMER(motor_off_timer, fd_motor_off_timer, 0, 0); | 376 | static DEFINE_TIMER(motor_off_timer, fd_motor_off_timer); |
377 | static DEFINE_TIMER(readtrack_timer, fd_readtrack_check, 0, 0); | 377 | static DEFINE_TIMER(readtrack_timer, fd_readtrack_check); |
378 | static DEFINE_TIMER(timeout_timer, fd_times_out, 0, 0); | 378 | static DEFINE_TIMER(timeout_timer, fd_times_out); |
379 | static DEFINE_TIMER(fd_timer, check_change, 0, 0); | 379 | static DEFINE_TIMER(fd_timer, check_change); |
380 | 380 | ||
381 | static void fd_end_request_cur(blk_status_t err) | 381 | static void fd_end_request_cur(blk_status_t err) |
382 | { | 382 | { |
diff --git a/drivers/char/dtlk.c b/drivers/char/dtlk.c index 58471394beb9..1a0385ed6417 100644 --- a/drivers/char/dtlk.c +++ b/drivers/char/dtlk.c | |||
@@ -84,7 +84,7 @@ static int dtlk_has_indexing; | |||
84 | static unsigned int dtlk_portlist[] = | 84 | static unsigned int dtlk_portlist[] = |
85 | {0x25e, 0x29e, 0x2de, 0x31e, 0x35e, 0x39e, 0}; | 85 | {0x25e, 0x29e, 0x2de, 0x31e, 0x35e, 0x39e, 0}; |
86 | static wait_queue_head_t dtlk_process_list; | 86 | static wait_queue_head_t dtlk_process_list; |
87 | static DEFINE_TIMER(dtlk_timer, dtlk_timer_tick, 0, 0); | 87 | static DEFINE_TIMER(dtlk_timer, dtlk_timer_tick); |
88 | 88 | ||
89 | /* prototypes for file_operations struct */ | 89 | /* prototypes for file_operations struct */ |
90 | static ssize_t dtlk_read(struct file *, char __user *, | 90 | static ssize_t dtlk_read(struct file *, char __user *, |
diff --git a/drivers/char/hangcheck-timer.c b/drivers/char/hangcheck-timer.c index 5406b90bf626..5b8db2ed844d 100644 --- a/drivers/char/hangcheck-timer.c +++ b/drivers/char/hangcheck-timer.c | |||
@@ -124,7 +124,7 @@ static unsigned long long hangcheck_tsc, hangcheck_tsc_margin; | |||
124 | 124 | ||
125 | static void hangcheck_fire(unsigned long); | 125 | static void hangcheck_fire(unsigned long); |
126 | 126 | ||
127 | static DEFINE_TIMER(hangcheck_ticktock, hangcheck_fire, 0, 0); | 127 | static DEFINE_TIMER(hangcheck_ticktock, hangcheck_fire); |
128 | 128 | ||
129 | static void hangcheck_fire(unsigned long data) | 129 | static void hangcheck_fire(unsigned long data) |
130 | { | 130 | { |
diff --git a/drivers/char/nwbutton.c b/drivers/char/nwbutton.c index e6d0d271c58c..44006ed9558f 100644 --- a/drivers/char/nwbutton.c +++ b/drivers/char/nwbutton.c | |||
@@ -27,7 +27,7 @@ static void button_sequence_finished (unsigned long parameters); | |||
27 | 27 | ||
28 | static int button_press_count; /* The count of button presses */ | 28 | static int button_press_count; /* The count of button presses */ |
29 | /* Times for the end of a sequence */ | 29 | /* Times for the end of a sequence */ |
30 | static DEFINE_TIMER(button_timer, button_sequence_finished, 0, 0); | 30 | static DEFINE_TIMER(button_timer, button_sequence_finished); |
31 | static DECLARE_WAIT_QUEUE_HEAD(button_wait_queue); /* Used for blocking read */ | 31 | static DECLARE_WAIT_QUEUE_HEAD(button_wait_queue); /* Used for blocking read */ |
32 | static char button_output_buffer[32]; /* Stores data to write out of device */ | 32 | static char button_output_buffer[32]; /* Stores data to write out of device */ |
33 | static int bcount; /* The number of bytes in the buffer */ | 33 | static int bcount; /* The number of bytes in the buffer */ |
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c index 974d48927b07..616871e68e09 100644 --- a/drivers/char/rtc.c +++ b/drivers/char/rtc.c | |||
@@ -137,7 +137,7 @@ static DECLARE_WAIT_QUEUE_HEAD(rtc_wait); | |||
137 | #ifdef RTC_IRQ | 137 | #ifdef RTC_IRQ |
138 | static void rtc_dropped_irq(unsigned long data); | 138 | static void rtc_dropped_irq(unsigned long data); |
139 | 139 | ||
140 | static DEFINE_TIMER(rtc_irq_timer, rtc_dropped_irq, 0, 0); | 140 | static DEFINE_TIMER(rtc_irq_timer, rtc_dropped_irq); |
141 | #endif | 141 | #endif |
142 | 142 | ||
143 | static ssize_t rtc_read(struct file *file, char __user *buf, | 143 | static ssize_t rtc_read(struct file *file, char __user *buf, |
diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c index 3b3db8c868e0..d3265b6b58b8 100644 --- a/drivers/input/touchscreen/s3c2410_ts.c +++ b/drivers/input/touchscreen/s3c2410_ts.c | |||
@@ -145,7 +145,7 @@ static void touch_timer_fire(unsigned long data) | |||
145 | } | 145 | } |
146 | } | 146 | } |
147 | 147 | ||
148 | static DEFINE_TIMER(touch_timer, touch_timer_fire, 0, 0); | 148 | static DEFINE_TIMER(touch_timer, touch_timer_fire); |
149 | 149 | ||
150 | /** | 150 | /** |
151 | * stylus_irq - touchscreen stylus event interrupt | 151 | * stylus_irq - touchscreen stylus event interrupt |
diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c index 017f48cdcab9..1fcc86fa4e05 100644 --- a/drivers/net/cris/eth_v10.c +++ b/drivers/net/cris/eth_v10.c | |||
@@ -165,8 +165,8 @@ static unsigned int network_rec_config_shadow = 0; | |||
165 | static unsigned int network_tr_ctrl_shadow = 0; | 165 | static unsigned int network_tr_ctrl_shadow = 0; |
166 | 166 | ||
167 | /* Network speed indication. */ | 167 | /* Network speed indication. */ |
168 | static DEFINE_TIMER(speed_timer, NULL, 0, 0); | 168 | static DEFINE_TIMER(speed_timer, NULL); |
169 | static DEFINE_TIMER(clear_led_timer, NULL, 0, 0); | 169 | static DEFINE_TIMER(clear_led_timer, NULL); |
170 | static int current_speed; /* Speed read from transceiver */ | 170 | static int current_speed; /* Speed read from transceiver */ |
171 | static int current_speed_selection; /* Speed selected by user */ | 171 | static int current_speed_selection; /* Speed selected by user */ |
172 | static unsigned long led_next_time; | 172 | static unsigned long led_next_time; |
@@ -174,7 +174,7 @@ static int led_active; | |||
174 | static int rx_queue_len; | 174 | static int rx_queue_len; |
175 | 175 | ||
176 | /* Duplex */ | 176 | /* Duplex */ |
177 | static DEFINE_TIMER(duplex_timer, NULL, 0, 0); | 177 | static DEFINE_TIMER(duplex_timer, NULL); |
178 | static int full_duplex; | 178 | static int full_duplex; |
179 | static enum duplex current_duplex; | 179 | static enum duplex current_duplex; |
180 | 180 | ||
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c index 7a7c5224a336..104f71fa9c5e 100644 --- a/drivers/net/hamradio/yam.c +++ b/drivers/net/hamradio/yam.c | |||
@@ -157,7 +157,7 @@ static struct net_device *yam_devs[NR_PORTS]; | |||
157 | 157 | ||
158 | static struct yam_mcs *yam_data; | 158 | static struct yam_mcs *yam_data; |
159 | 159 | ||
160 | static DEFINE_TIMER(yam_timer, NULL, 0, 0); | 160 | static DEFINE_TIMER(yam_timer, NULL); |
161 | 161 | ||
162 | /* --------------------------------------------------------------------- */ | 162 | /* --------------------------------------------------------------------- */ |
163 | 163 | ||
diff --git a/drivers/net/wireless/atmel/at76c50x-usb.c b/drivers/net/wireless/atmel/at76c50x-usb.c index 94bf01f8b2a8..ede89d4ffc88 100644 --- a/drivers/net/wireless/atmel/at76c50x-usb.c +++ b/drivers/net/wireless/atmel/at76c50x-usb.c | |||
@@ -519,7 +519,7 @@ exit: | |||
519 | /* LED trigger */ | 519 | /* LED trigger */ |
520 | static int tx_activity; | 520 | static int tx_activity; |
521 | static void at76_ledtrig_tx_timerfunc(unsigned long data); | 521 | static void at76_ledtrig_tx_timerfunc(unsigned long data); |
522 | static DEFINE_TIMER(ledtrig_tx_timer, at76_ledtrig_tx_timerfunc, 0, 0); | 522 | static DEFINE_TIMER(ledtrig_tx_timer, at76_ledtrig_tx_timerfunc); |
523 | DEFINE_LED_TRIGGER(ledtrig_tx); | 523 | DEFINE_LED_TRIGGER(ledtrig_tx); |
524 | 524 | ||
525 | static void at76_ledtrig_tx_timerfunc(unsigned long data) | 525 | static void at76_ledtrig_tx_timerfunc(unsigned long data) |
diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c index 56f7be6af1f6..585925bb49a4 100644 --- a/drivers/staging/speakup/main.c +++ b/drivers/staging/speakup/main.c | |||
@@ -1165,7 +1165,7 @@ static const int NUM_CTL_LABELS = (MSG_CTL_END - MSG_CTL_START + 1); | |||
1165 | 1165 | ||
1166 | static void read_all_doc(struct vc_data *vc); | 1166 | static void read_all_doc(struct vc_data *vc); |
1167 | static void cursor_done(u_long data); | 1167 | static void cursor_done(u_long data); |
1168 | static DEFINE_TIMER(cursor_timer, cursor_done, 0, 0); | 1168 | static DEFINE_TIMER(cursor_timer, cursor_done); |
1169 | 1169 | ||
1170 | static void do_handle_shift(struct vc_data *vc, u_char value, char up_flag) | 1170 | static void do_handle_shift(struct vc_data *vc, u_char value, char up_flag) |
1171 | { | 1171 | { |
diff --git a/drivers/staging/speakup/synth.c b/drivers/staging/speakup/synth.c index a1ca68c76579..6ddd3fc3f08d 100644 --- a/drivers/staging/speakup/synth.c +++ b/drivers/staging/speakup/synth.c | |||
@@ -158,7 +158,7 @@ static void thread_wake_up(u_long data) | |||
158 | wake_up_interruptible_all(&speakup_event); | 158 | wake_up_interruptible_all(&speakup_event); |
159 | } | 159 | } |
160 | 160 | ||
161 | static DEFINE_TIMER(thread_timer, thread_wake_up, 0, 0); | 161 | static DEFINE_TIMER(thread_timer, thread_wake_up); |
162 | 162 | ||
163 | void synth_start(void) | 163 | void synth_start(void) |
164 | { | 164 | { |
diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c index d272bc4e7fb5..dac8a1a8e4ac 100644 --- a/drivers/tty/cyclades.c +++ b/drivers/tty/cyclades.c | |||
@@ -283,7 +283,7 @@ static void cyz_poll(unsigned long); | |||
283 | /* The Cyclades-Z polling cycle is defined by this variable */ | 283 | /* The Cyclades-Z polling cycle is defined by this variable */ |
284 | static long cyz_polling_cycle = CZ_DEF_POLL; | 284 | static long cyz_polling_cycle = CZ_DEF_POLL; |
285 | 285 | ||
286 | static DEFINE_TIMER(cyz_timerlist, cyz_poll, 0, 0); | 286 | static DEFINE_TIMER(cyz_timerlist, cyz_poll); |
287 | 287 | ||
288 | #else /* CONFIG_CYZ_INTR */ | 288 | #else /* CONFIG_CYZ_INTR */ |
289 | static void cyz_rx_restart(unsigned long); | 289 | static void cyz_rx_restart(unsigned long); |
diff --git a/drivers/tty/isicom.c b/drivers/tty/isicom.c index 61ecdd6b2fc2..40af32108ff5 100644 --- a/drivers/tty/isicom.c +++ b/drivers/tty/isicom.c | |||
@@ -177,7 +177,7 @@ static struct tty_driver *isicom_normal; | |||
177 | static void isicom_tx(unsigned long _data); | 177 | static void isicom_tx(unsigned long _data); |
178 | static void isicom_start(struct tty_struct *tty); | 178 | static void isicom_start(struct tty_struct *tty); |
179 | 179 | ||
180 | static DEFINE_TIMER(tx, isicom_tx, 0, 0); | 180 | static DEFINE_TIMER(tx, isicom_tx); |
181 | 181 | ||
182 | /* baud index mappings from linux defns to isi */ | 182 | /* baud index mappings from linux defns to isi */ |
183 | 183 | ||
diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c index 7f3d4cb0341b..93d37655d928 100644 --- a/drivers/tty/moxa.c +++ b/drivers/tty/moxa.c | |||
@@ -428,7 +428,7 @@ static const struct tty_port_operations moxa_port_ops = { | |||
428 | }; | 428 | }; |
429 | 429 | ||
430 | static struct tty_driver *moxaDriver; | 430 | static struct tty_driver *moxaDriver; |
431 | static DEFINE_TIMER(moxaTimer, moxa_poll, 0, 0); | 431 | static DEFINE_TIMER(moxaTimer, moxa_poll); |
432 | 432 | ||
433 | /* | 433 | /* |
434 | * HW init | 434 | * HW init |
diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c index 20d79a6007d5..aa695fda1084 100644 --- a/drivers/tty/rocket.c +++ b/drivers/tty/rocket.c | |||
@@ -111,7 +111,7 @@ static struct r_port *rp_table[MAX_RP_PORTS]; /* The main repository of | |||
111 | static unsigned int xmit_flags[NUM_BOARDS]; /* Bit significant, indicates port had data to transmit. */ | 111 | static unsigned int xmit_flags[NUM_BOARDS]; /* Bit significant, indicates port had data to transmit. */ |
112 | /* eg. Bit 0 indicates port 0 has xmit data, ... */ | 112 | /* eg. Bit 0 indicates port 0 has xmit data, ... */ |
113 | static atomic_t rp_num_ports_open; /* Number of serial ports open */ | 113 | static atomic_t rp_num_ports_open; /* Number of serial ports open */ |
114 | static DEFINE_TIMER(rocket_timer, rp_do_poll, 0, 0); | 114 | static DEFINE_TIMER(rocket_timer, rp_do_poll); |
115 | 115 | ||
116 | static unsigned long board1; /* ISA addresses, retrieved from rocketport.conf */ | 116 | static unsigned long board1; /* ISA addresses, retrieved from rocketport.conf */ |
117 | static unsigned long board2; | 117 | static unsigned long board2; |
diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c index f4166263bb3a..f974d6340d04 100644 --- a/drivers/tty/vt/keyboard.c +++ b/drivers/tty/vt/keyboard.c | |||
@@ -250,7 +250,7 @@ static void kd_nosound(unsigned long ignored) | |||
250 | input_handler_for_each_handle(&kbd_handler, &zero, kd_sound_helper); | 250 | input_handler_for_each_handle(&kbd_handler, &zero, kd_sound_helper); |
251 | } | 251 | } |
252 | 252 | ||
253 | static DEFINE_TIMER(kd_mksound_timer, kd_nosound, 0, 0); | 253 | static DEFINE_TIMER(kd_mksound_timer, kd_nosound); |
254 | 254 | ||
255 | void kd_mksound(unsigned int hz, unsigned int ticks) | 255 | void kd_mksound(unsigned int hz, unsigned int ticks) |
256 | { | 256 | { |
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c index 2ebaba16f785..602d71630952 100644 --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c | |||
@@ -228,7 +228,7 @@ static int scrollback_delta; | |||
228 | */ | 228 | */ |
229 | int (*console_blank_hook)(int); | 229 | int (*console_blank_hook)(int); |
230 | 230 | ||
231 | static DEFINE_TIMER(console_timer, blank_screen_t, 0, 0); | 231 | static DEFINE_TIMER(console_timer, blank_screen_t); |
232 | static int blank_state; | 232 | static int blank_state; |
233 | static int blank_timer_expired; | 233 | static int blank_timer_expired; |
234 | enum { | 234 | enum { |
diff --git a/drivers/watchdog/alim7101_wdt.c b/drivers/watchdog/alim7101_wdt.c index 3c1f6ac68ea9..18e896eeca62 100644 --- a/drivers/watchdog/alim7101_wdt.c +++ b/drivers/watchdog/alim7101_wdt.c | |||
@@ -71,7 +71,7 @@ MODULE_PARM_DESC(use_gpio, | |||
71 | "Use the gpio watchdog (required by old cobalt boards)."); | 71 | "Use the gpio watchdog (required by old cobalt boards)."); |
72 | 72 | ||
73 | static void wdt_timer_ping(unsigned long); | 73 | static void wdt_timer_ping(unsigned long); |
74 | static DEFINE_TIMER(timer, wdt_timer_ping, 0, 0); | 74 | static DEFINE_TIMER(timer, wdt_timer_ping); |
75 | static unsigned long next_heartbeat; | 75 | static unsigned long next_heartbeat; |
76 | static unsigned long wdt_is_open; | 76 | static unsigned long wdt_is_open; |
77 | static char wdt_expect_close; | 77 | static char wdt_expect_close; |
diff --git a/drivers/watchdog/machzwd.c b/drivers/watchdog/machzwd.c index 9826b59ef734..8a616a57bb90 100644 --- a/drivers/watchdog/machzwd.c +++ b/drivers/watchdog/machzwd.c | |||
@@ -127,7 +127,7 @@ static int zf_action = GEN_RESET; | |||
127 | static unsigned long zf_is_open; | 127 | static unsigned long zf_is_open; |
128 | static char zf_expect_close; | 128 | static char zf_expect_close; |
129 | static DEFINE_SPINLOCK(zf_port_lock); | 129 | static DEFINE_SPINLOCK(zf_port_lock); |
130 | static DEFINE_TIMER(zf_timer, zf_ping, 0, 0); | 130 | static DEFINE_TIMER(zf_timer, zf_ping); |
131 | static unsigned long next_heartbeat; | 131 | static unsigned long next_heartbeat; |
132 | 132 | ||
133 | 133 | ||
diff --git a/drivers/watchdog/mixcomwd.c b/drivers/watchdog/mixcomwd.c index be86ea359eee..c9e38096ea91 100644 --- a/drivers/watchdog/mixcomwd.c +++ b/drivers/watchdog/mixcomwd.c | |||
@@ -105,7 +105,7 @@ static unsigned long mixcomwd_opened; /* long req'd for setbit --RR */ | |||
105 | 105 | ||
106 | static int watchdog_port; | 106 | static int watchdog_port; |
107 | static int mixcomwd_timer_alive; | 107 | static int mixcomwd_timer_alive; |
108 | static DEFINE_TIMER(mixcomwd_timer, mixcomwd_timerfun, 0, 0); | 108 | static DEFINE_TIMER(mixcomwd_timer, mixcomwd_timerfun); |
109 | static char expect_close; | 109 | static char expect_close; |
110 | 110 | ||
111 | static bool nowayout = WATCHDOG_NOWAYOUT; | 111 | static bool nowayout = WATCHDOG_NOWAYOUT; |
diff --git a/drivers/watchdog/sbc60xxwdt.c b/drivers/watchdog/sbc60xxwdt.c index 2eef58a0cf05..8d589939bc84 100644 --- a/drivers/watchdog/sbc60xxwdt.c +++ b/drivers/watchdog/sbc60xxwdt.c | |||
@@ -113,7 +113,7 @@ MODULE_PARM_DESC(nowayout, | |||
113 | __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); | 113 | __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); |
114 | 114 | ||
115 | static void wdt_timer_ping(unsigned long); | 115 | static void wdt_timer_ping(unsigned long); |
116 | static DEFINE_TIMER(timer, wdt_timer_ping, 0, 0); | 116 | static DEFINE_TIMER(timer, wdt_timer_ping); |
117 | static unsigned long next_heartbeat; | 117 | static unsigned long next_heartbeat; |
118 | static unsigned long wdt_is_open; | 118 | static unsigned long wdt_is_open; |
119 | static char wdt_expect_close; | 119 | static char wdt_expect_close; |
diff --git a/drivers/watchdog/sc520_wdt.c b/drivers/watchdog/sc520_wdt.c index 1cfd3f6a13d5..3e9bbaa37bf4 100644 --- a/drivers/watchdog/sc520_wdt.c +++ b/drivers/watchdog/sc520_wdt.c | |||
@@ -124,7 +124,7 @@ MODULE_PARM_DESC(nowayout, | |||
124 | static __u16 __iomem *wdtmrctl; | 124 | static __u16 __iomem *wdtmrctl; |
125 | 125 | ||
126 | static void wdt_timer_ping(unsigned long); | 126 | static void wdt_timer_ping(unsigned long); |
127 | static DEFINE_TIMER(timer, wdt_timer_ping, 0, 0); | 127 | static DEFINE_TIMER(timer, wdt_timer_ping); |
128 | static unsigned long next_heartbeat; | 128 | static unsigned long next_heartbeat; |
129 | static unsigned long wdt_is_open; | 129 | static unsigned long wdt_is_open; |
130 | static char wdt_expect_close; | 130 | static char wdt_expect_close; |
diff --git a/drivers/watchdog/via_wdt.c b/drivers/watchdog/via_wdt.c index 5f9cbc37520d..ad3c3be13b40 100644 --- a/drivers/watchdog/via_wdt.c +++ b/drivers/watchdog/via_wdt.c | |||
@@ -68,7 +68,7 @@ static struct resource wdt_res; | |||
68 | static void __iomem *wdt_mem; | 68 | static void __iomem *wdt_mem; |
69 | static unsigned int mmio; | 69 | static unsigned int mmio; |
70 | static void wdt_timer_tick(unsigned long data); | 70 | static void wdt_timer_tick(unsigned long data); |
71 | static DEFINE_TIMER(timer, wdt_timer_tick, 0, 0); | 71 | static DEFINE_TIMER(timer, wdt_timer_tick); |
72 | /* The timer that pings the watchdog */ | 72 | /* The timer that pings the watchdog */ |
73 | static unsigned long next_heartbeat; /* the next_heartbeat for the timer */ | 73 | static unsigned long next_heartbeat; /* the next_heartbeat for the timer */ |
74 | 74 | ||
diff --git a/drivers/watchdog/w83877f_wdt.c b/drivers/watchdog/w83877f_wdt.c index f0483c75ed32..ba6b680af100 100644 --- a/drivers/watchdog/w83877f_wdt.c +++ b/drivers/watchdog/w83877f_wdt.c | |||
@@ -98,7 +98,7 @@ MODULE_PARM_DESC(nowayout, | |||
98 | __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); | 98 | __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); |
99 | 99 | ||
100 | static void wdt_timer_ping(unsigned long); | 100 | static void wdt_timer_ping(unsigned long); |
101 | static DEFINE_TIMER(timer, wdt_timer_ping, 0, 0); | 101 | static DEFINE_TIMER(timer, wdt_timer_ping); |
102 | static unsigned long next_heartbeat; | 102 | static unsigned long next_heartbeat; |
103 | static unsigned long wdt_is_open; | 103 | static unsigned long wdt_is_open; |
104 | static char wdt_expect_close; | 104 | static char wdt_expect_close; |
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index 2c6a9114d332..a8721d718186 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c | |||
@@ -305,7 +305,7 @@ struct deferred_entry { | |||
305 | }; | 305 | }; |
306 | static LIST_HEAD(deferred_list); | 306 | static LIST_HEAD(deferred_list); |
307 | static void gnttab_handle_deferred(unsigned long); | 307 | static void gnttab_handle_deferred(unsigned long); |
308 | static DEFINE_TIMER(deferred_timer, gnttab_handle_deferred, 0, 0); | 308 | static DEFINE_TIMER(deferred_timer, gnttab_handle_deferred); |
309 | 309 | ||
310 | static void gnttab_handle_deferred(unsigned long unused) | 310 | static void gnttab_handle_deferred(unsigned long unused) |
311 | { | 311 | { |
diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c index 2b21d180157c..ec7199e859d2 100644 --- a/fs/pstore/platform.c +++ b/fs/pstore/platform.c | |||
@@ -62,7 +62,7 @@ MODULE_PARM_DESC(update_ms, "milliseconds before pstore updates its content " | |||
62 | static int pstore_new_entry; | 62 | static int pstore_new_entry; |
63 | 63 | ||
64 | static void pstore_timefunc(unsigned long); | 64 | static void pstore_timefunc(unsigned long); |
65 | static DEFINE_TIMER(pstore_timer, pstore_timefunc, 0, 0); | 65 | static DEFINE_TIMER(pstore_timer, pstore_timefunc); |
66 | 66 | ||
67 | static void pstore_dowork(struct work_struct *); | 67 | static void pstore_dowork(struct work_struct *); |
68 | static DECLARE_WORK(pstore_work, pstore_dowork); | 68 | static DECLARE_WORK(pstore_work, pstore_dowork); |
diff --git a/include/linux/timer.h b/include/linux/timer.h index a33220311361..91e5a2cc81b5 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h | |||
@@ -73,9 +73,9 @@ struct timer_list { | |||
73 | __FILE__ ":" __stringify(__LINE__)) \ | 73 | __FILE__ ":" __stringify(__LINE__)) \ |
74 | } | 74 | } |
75 | 75 | ||
76 | #define DEFINE_TIMER(_name, _function, _expires, _data) \ | 76 | #define DEFINE_TIMER(_name, _function) \ |
77 | struct timer_list _name = \ | 77 | struct timer_list _name = \ |
78 | __TIMER_INITIALIZER(_function, _expires, _data, 0) | 78 | __TIMER_INITIALIZER(_function, 0, 0, 0) |
79 | 79 | ||
80 | void init_timer_key(struct timer_list *timer, unsigned int flags, | 80 | void init_timer_key(struct timer_list *timer, unsigned int flags, |
81 | const char *name, struct lock_class_key *key); | 81 | const char *name, struct lock_class_key *key); |
diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c index 061ba7eed4ed..c805e8691c22 100644 --- a/kernel/irq/spurious.c +++ b/kernel/irq/spurious.c | |||
@@ -20,7 +20,7 @@ static int irqfixup __read_mostly; | |||
20 | 20 | ||
21 | #define POLL_SPURIOUS_IRQ_INTERVAL (HZ/10) | 21 | #define POLL_SPURIOUS_IRQ_INTERVAL (HZ/10) |
22 | static void poll_spurious_irqs(unsigned long dummy); | 22 | static void poll_spurious_irqs(unsigned long dummy); |
23 | static DEFINE_TIMER(poll_spurious_irq_timer, poll_spurious_irqs, 0, 0); | 23 | static DEFINE_TIMER(poll_spurious_irq_timer, poll_spurious_irqs); |
24 | static int irq_poll_cpu; | 24 | static int irq_poll_cpu; |
25 | static atomic_t irq_poll_active; | 25 | static atomic_t irq_poll_active; |
26 | 26 | ||
diff --git a/lib/random32.c b/lib/random32.c index fa594b1140e6..6e91b75c113f 100644 --- a/lib/random32.c +++ b/lib/random32.c | |||
@@ -214,7 +214,7 @@ core_initcall(prandom_init); | |||
214 | 214 | ||
215 | static void __prandom_timer(unsigned long dontcare); | 215 | static void __prandom_timer(unsigned long dontcare); |
216 | 216 | ||
217 | static DEFINE_TIMER(seed_timer, __prandom_timer, 0, 0); | 217 | static DEFINE_TIMER(seed_timer, __prandom_timer); |
218 | 218 | ||
219 | static void __prandom_timer(unsigned long dontcare) | 219 | static void __prandom_timer(unsigned long dontcare) |
220 | { | 220 | { |
diff --git a/net/atm/mpc.c b/net/atm/mpc.c index 5677147209e8..63138c8c2269 100644 --- a/net/atm/mpc.c +++ b/net/atm/mpc.c | |||
@@ -121,7 +121,7 @@ static struct notifier_block mpoa_notifier = { | |||
121 | 121 | ||
122 | struct mpoa_client *mpcs = NULL; /* FIXME */ | 122 | struct mpoa_client *mpcs = NULL; /* FIXME */ |
123 | static struct atm_mpoa_qos *qos_head = NULL; | 123 | static struct atm_mpoa_qos *qos_head = NULL; |
124 | static DEFINE_TIMER(mpc_timer, NULL, 0, 0); | 124 | static DEFINE_TIMER(mpc_timer, NULL); |
125 | 125 | ||
126 | 126 | ||
127 | static struct mpoa_client *find_mpc_by_itfnum(int itf) | 127 | static struct mpoa_client *find_mpc_by_itfnum(int itf) |
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c index 0bd3afd01dd2..6538632fbd03 100644 --- a/net/decnet/dn_route.c +++ b/net/decnet/dn_route.c | |||
@@ -131,7 +131,7 @@ static struct dn_rt_hash_bucket *dn_rt_hash_table; | |||
131 | static unsigned int dn_rt_hash_mask; | 131 | static unsigned int dn_rt_hash_mask; |
132 | 132 | ||
133 | static struct timer_list dn_route_timer; | 133 | static struct timer_list dn_route_timer; |
134 | static DEFINE_TIMER(dn_rt_flush_timer, dn_run_flush, 0, 0); | 134 | static DEFINE_TIMER(dn_rt_flush_timer, dn_run_flush); |
135 | int decnet_dst_gc_interval = 2; | 135 | int decnet_dst_gc_interval = 2; |
136 | 136 | ||
137 | static struct dst_ops dn_dst_ops = { | 137 | static struct dst_ops dn_dst_ops = { |
diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c index 8081bafe441b..b39d0908be2e 100644 --- a/net/ipv6/ip6_flowlabel.c +++ b/net/ipv6/ip6_flowlabel.c | |||
@@ -47,7 +47,7 @@ static atomic_t fl_size = ATOMIC_INIT(0); | |||
47 | static struct ip6_flowlabel __rcu *fl_ht[FL_HASH_MASK+1]; | 47 | static struct ip6_flowlabel __rcu *fl_ht[FL_HASH_MASK+1]; |
48 | 48 | ||
49 | static void ip6_fl_gc(unsigned long dummy); | 49 | static void ip6_fl_gc(unsigned long dummy); |
50 | static DEFINE_TIMER(ip6_fl_gc_timer, ip6_fl_gc, 0, 0); | 50 | static DEFINE_TIMER(ip6_fl_gc_timer, ip6_fl_gc); |
51 | 51 | ||
52 | /* FL hash table lock: it protects only of GC */ | 52 | /* FL hash table lock: it protects only of GC */ |
53 | 53 | ||
diff --git a/net/netrom/nr_loopback.c b/net/netrom/nr_loopback.c index 94d4e922af53..989ae647825e 100644 --- a/net/netrom/nr_loopback.c +++ b/net/netrom/nr_loopback.c | |||
@@ -18,7 +18,7 @@ | |||
18 | static void nr_loopback_timer(unsigned long); | 18 | static void nr_loopback_timer(unsigned long); |
19 | 19 | ||
20 | static struct sk_buff_head loopback_queue; | 20 | static struct sk_buff_head loopback_queue; |
21 | static DEFINE_TIMER(loopback_timer, nr_loopback_timer, 0, 0); | 21 | static DEFINE_TIMER(loopback_timer, nr_loopback_timer); |
22 | 22 | ||
23 | void __init nr_loopback_init(void) | 23 | void __init nr_loopback_init(void) |
24 | { | 24 | { |
diff --git a/security/keys/gc.c b/security/keys/gc.c index 87cb260e4890..8673f7f58ead 100644 --- a/security/keys/gc.c +++ b/security/keys/gc.c | |||
@@ -30,7 +30,7 @@ DECLARE_WORK(key_gc_work, key_garbage_collector); | |||
30 | * Reaper for links from keyrings to dead keys. | 30 | * Reaper for links from keyrings to dead keys. |
31 | */ | 31 | */ |
32 | static void key_gc_timer_func(unsigned long); | 32 | static void key_gc_timer_func(unsigned long); |
33 | static DEFINE_TIMER(key_gc_timer, key_gc_timer_func, 0, 0); | 33 | static DEFINE_TIMER(key_gc_timer, key_gc_timer_func); |
34 | 34 | ||
35 | static time_t key_gc_next_run = LONG_MAX; | 35 | static time_t key_gc_next_run = LONG_MAX; |
36 | static struct key_type *key_gc_dead_keytype; | 36 | static struct key_type *key_gc_dead_keytype; |
diff --git a/sound/oss/midibuf.c b/sound/oss/midibuf.c index 701c7625c971..1277df815d5b 100644 --- a/sound/oss/midibuf.c +++ b/sound/oss/midibuf.c | |||
@@ -52,7 +52,7 @@ static struct midi_parms parms[MAX_MIDI_DEV]; | |||
52 | static void midi_poll(unsigned long dummy); | 52 | static void midi_poll(unsigned long dummy); |
53 | 53 | ||
54 | 54 | ||
55 | static DEFINE_TIMER(poll_timer, midi_poll, 0, 0); | 55 | static DEFINE_TIMER(poll_timer, midi_poll); |
56 | 56 | ||
57 | static volatile int open_devs; | 57 | static volatile int open_devs; |
58 | static DEFINE_SPINLOCK(lock); | 58 | static DEFINE_SPINLOCK(lock); |
diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c index b70c7c8f9c5d..4391062e5cfd 100644 --- a/sound/oss/soundcard.c +++ b/sound/oss/soundcard.c | |||
@@ -662,7 +662,7 @@ static void do_sequencer_timer(unsigned long dummy) | |||
662 | } | 662 | } |
663 | 663 | ||
664 | 664 | ||
665 | static DEFINE_TIMER(seq_timer, do_sequencer_timer, 0, 0); | 665 | static DEFINE_TIMER(seq_timer, do_sequencer_timer); |
666 | 666 | ||
667 | void request_sound_timer(int count) | 667 | void request_sound_timer(int count) |
668 | { | 668 | { |
diff --git a/sound/oss/sys_timer.c b/sound/oss/sys_timer.c index d17019d25b99..8a4b5625dba6 100644 --- a/sound/oss/sys_timer.c +++ b/sound/oss/sys_timer.c | |||
@@ -28,7 +28,7 @@ static unsigned long prev_event_time; | |||
28 | 28 | ||
29 | static void poll_def_tmr(unsigned long dummy); | 29 | static void poll_def_tmr(unsigned long dummy); |
30 | static DEFINE_SPINLOCK(lock); | 30 | static DEFINE_SPINLOCK(lock); |
31 | static DEFINE_TIMER(def_tmr, poll_def_tmr, 0, 0); | 31 | static DEFINE_TIMER(def_tmr, poll_def_tmr); |
32 | 32 | ||
33 | static unsigned long | 33 | static unsigned long |
34 | tmr2ticks(int tmr_value) | 34 | tmr2ticks(int tmr_value) |
diff --git a/sound/oss/uart6850.c b/sound/oss/uart6850.c index eda32d7eddbd..a9d3f7568525 100644 --- a/sound/oss/uart6850.c +++ b/sound/oss/uart6850.c | |||
@@ -78,7 +78,7 @@ static void (*midi_input_intr) (int dev, unsigned char data); | |||
78 | static void poll_uart6850(unsigned long dummy); | 78 | static void poll_uart6850(unsigned long dummy); |
79 | 79 | ||
80 | 80 | ||
81 | static DEFINE_TIMER(uart6850_timer, poll_uart6850, 0, 0); | 81 | static DEFINE_TIMER(uart6850_timer, poll_uart6850); |
82 | 82 | ||
83 | static void uart6850_input_loop(void) | 83 | static void uart6850_input_loop(void) |
84 | { | 84 | { |