|
@@ -3125,9 +3125,8 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
|
|
|
|
|
|
mib_counters_clear(mp);
|
|
|
|
|
|
- init_timer(&mp->mib_counters_timer);
|
|
|
- mp->mib_counters_timer.data = (unsigned long)mp;
|
|
|
- mp->mib_counters_timer.function = mib_counters_timer_wrapper;
|
|
|
+ setup_timer(&mp->mib_counters_timer, mib_counters_timer_wrapper,
|
|
|
+ (unsigned long)mp);
|
|
|
mp->mib_counters_timer.expires = jiffies + 30 * HZ;
|
|
|
|
|
|
spin_lock_init(&mp->mib_counters_lock);
|
|
@@ -3136,9 +3135,7 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
|
|
|
|
|
|
netif_napi_add(dev, &mp->napi, mv643xx_eth_poll, NAPI_POLL_WEIGHT);
|
|
|
|
|
|
- init_timer(&mp->rx_oom);
|
|
|
- mp->rx_oom.data = (unsigned long)mp;
|
|
|
- mp->rx_oom.function = oom_timer_wrapper;
|
|
|
+ setup_timer(&mp->rx_oom, oom_timer_wrapper, (unsigned long)mp);
|
|
|
|
|
|
|
|
|
res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
|