|
@@ -4144,10 +4144,8 @@ struct brcmf_sdio *brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev)
|
|
|
init_waitqueue_head(&bus->dcmd_resp_wait);
|
|
|
|
|
|
/* Set up the watchdog timer */
|
|
|
- init_timer(&bus->timer);
|
|
|
- bus->timer.data = (unsigned long)bus;
|
|
|
- bus->timer.function = brcmf_sdio_watchdog;
|
|
|
-
|
|
|
+ setup_timer(&bus->timer, brcmf_sdio_watchdog,
|
|
|
+ (unsigned long)bus);
|
|
|
/* Initialize watchdog thread */
|
|
|
init_completion(&bus->watchdog_wait);
|
|
|
bus->watchdog_tsk = kthread_run(brcmf_sdio_watchdog_thread,
|