|
@@ -2483,9 +2483,8 @@ static int r8a66597_probe(struct platform_device *pdev)
|
|
|
r8a66597->max_root_hub = 2;
|
|
|
|
|
|
spin_lock_init(&r8a66597->lock);
|
|
|
- init_timer(&r8a66597->rh_timer);
|
|
|
- r8a66597->rh_timer.function = r8a66597_timer;
|
|
|
- r8a66597->rh_timer.data = (unsigned long)r8a66597;
|
|
|
+ setup_timer(&r8a66597->rh_timer, r8a66597_timer,
|
|
|
+ (unsigned long)r8a66597);
|
|
|
r8a66597->reg = reg;
|
|
|
|
|
|
/* make sure no interrupts are pending */
|
|
@@ -2496,9 +2495,8 @@ static int r8a66597_probe(struct platform_device *pdev)
|
|
|
|
|
|
for (i = 0; i < R8A66597_MAX_NUM_PIPE; i++) {
|
|
|
INIT_LIST_HEAD(&r8a66597->pipe_queue[i]);
|
|
|
- init_timer(&r8a66597->td_timer[i]);
|
|
|
- r8a66597->td_timer[i].function = r8a66597_td_timer;
|
|
|
- r8a66597->td_timer[i].data = (unsigned long)r8a66597;
|
|
|
+ setup_timer(&r8a66597->td_timer[i], r8a66597_td_timer,
|
|
|
+ (unsigned long)r8a66597);
|
|
|
setup_timer(&r8a66597->interval_timer[i],
|
|
|
r8a66597_interval_timer,
|
|
|
(unsigned long)r8a66597);
|