|
@@ -53,7 +53,7 @@ static DEFINE_SPINLOCK(sunis_lock);
|
|
|
if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
|
|
|
|
|
|
|
|
|
-static void suni_hz(unsigned long from_timer)
|
|
|
+static void suni_hz(struct timer_list *timer)
|
|
|
{
|
|
|
struct suni_priv *walk;
|
|
|
struct atm_dev *dev;
|
|
@@ -85,7 +85,7 @@ static void suni_hz(unsigned long from_timer)
|
|
|
((GET(TACP_TCC) & 0xff) << 8) |
|
|
|
((GET(TACP_TCCM) & 7) << 16));
|
|
|
}
|
|
|
- if (from_timer) mod_timer(&poll_timer,jiffies+HZ);
|
|
|
+ if (timer) mod_timer(&poll_timer,jiffies+HZ);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -322,13 +322,11 @@ static int suni_start(struct atm_dev *dev)
|
|
|
printk(KERN_WARNING "%s(itf %d): no signal\n",dev->type,
|
|
|
dev->number);
|
|
|
PRIV(dev)->loop_mode = ATM_LM_NONE;
|
|
|
- suni_hz(0); /* clear SUNI counters */
|
|
|
+ suni_hz(NULL); /* clear SUNI counters */
|
|
|
(void) fetch_stats(dev,NULL,1); /* clear kernel counters */
|
|
|
if (first) {
|
|
|
- init_timer(&poll_timer);
|
|
|
+ timer_setup(&poll_timer, suni_hz, 0);
|
|
|
poll_timer.expires = jiffies+HZ;
|
|
|
- poll_timer.function = suni_hz;
|
|
|
- poll_timer.data = 1;
|
|
|
#if 0
|
|
|
printk(KERN_DEBUG "[u] p=0x%lx,n=0x%lx\n",(unsigned long) poll_timer.list.prev,
|
|
|
(unsigned long) poll_timer.list.next);
|