|
@@ -706,8 +706,6 @@ static int jr3_pci_auto_attach(struct comedi_device *dev,
|
|
if (!devpriv)
|
|
if (!devpriv)
|
|
return -ENOMEM;
|
|
return -ENOMEM;
|
|
|
|
|
|
- init_timer(&devpriv->timer);
|
|
|
|
-
|
|
|
|
ret = comedi_pci_enable(dev);
|
|
ret = comedi_pci_enable(dev);
|
|
if (ret)
|
|
if (ret)
|
|
return ret;
|
|
return ret;
|
|
@@ -775,8 +773,7 @@ static int jr3_pci_auto_attach(struct comedi_device *dev,
|
|
spriv->next_time_max = jiffies + msecs_to_jiffies(2000);
|
|
spriv->next_time_max = jiffies + msecs_to_jiffies(2000);
|
|
}
|
|
}
|
|
|
|
|
|
- devpriv->timer.data = (unsigned long)dev;
|
|
|
|
- devpriv->timer.function = jr3_pci_poll_dev;
|
|
|
|
|
|
+ setup_timer(&devpriv->timer, jr3_pci_poll_dev, (unsigned long)dev);
|
|
devpriv->timer.expires = jiffies + msecs_to_jiffies(1000);
|
|
devpriv->timer.expires = jiffies + msecs_to_jiffies(1000);
|
|
add_timer(&devpriv->timer);
|
|
add_timer(&devpriv->timer);
|
|
|
|
|