diff options
Diffstat (limited to 'drivers/staging/comedi/drivers/jr3_pci.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/jr3_pci.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c index f1c2a20a7d4d..cbff3b41bb45 100644 --- a/drivers/staging/comedi/drivers/jr3_pci.c +++ b/drivers/staging/comedi/drivers/jr3_pci.c @@ -96,6 +96,7 @@ struct jr3_pci_poll_delay { struct jr3_pci_dev_private { struct timer_list timer; + struct comedi_device *dev; }; union jr3_pci_single_range { @@ -585,10 +586,10 @@ jr3_pci_poll_subdevice(struct comedi_subdevice *s) return result; } -static void jr3_pci_poll_dev(unsigned long data) +static void jr3_pci_poll_dev(struct timer_list *t) { - struct comedi_device *dev = (struct comedi_device *)data; - struct jr3_pci_dev_private *devpriv = dev->private; + struct jr3_pci_dev_private *devpriv = from_timer(devpriv, t, timer); + struct comedi_device *dev = devpriv->dev; struct jr3_pci_subdev_private *spriv; struct comedi_subdevice *s; unsigned long flags; @@ -770,7 +771,8 @@ static int jr3_pci_auto_attach(struct comedi_device *dev, spriv->next_time_min = jiffies + msecs_to_jiffies(500); } - setup_timer(&devpriv->timer, jr3_pci_poll_dev, (unsigned long)dev); + devpriv->dev = dev; + timer_setup(&devpriv->timer, jr3_pci_poll_dev, 0); devpriv->timer.expires = jiffies + msecs_to_jiffies(1000); add_timer(&devpriv->timer); |