diff options
Diffstat (limited to 'drivers/staging/comedi/drivers/adv_pci1710.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/adv_pci1710.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c index e19ab958791b..5539bd294862 100644 --- a/drivers/staging/comedi/drivers/adv_pci1710.c +++ b/drivers/staging/comedi/drivers/adv_pci1710.c @@ -327,7 +327,7 @@ static int pci171x_ai_dropout(struct comedi_device *dev, unsigned int chan, unsigned int val) { - const struct boardtype *board = comedi_board(dev); + const struct boardtype *board = dev->board_ptr; struct pci1710_private *devpriv = dev->private; if (board->cardtype != TYPE_PCI1713) { @@ -413,7 +413,7 @@ static void setup_channel_list(struct comedi_device *dev, unsigned int *chanlist, unsigned int n_chan, unsigned int seglen) { - const struct boardtype *this_board = comedi_board(dev); + const struct boardtype *this_board = dev->board_ptr; struct pci1710_private *devpriv = dev->private; unsigned int i, range, chanprog; @@ -715,7 +715,7 @@ static int pci1720_insn_write_ao(struct comedi_device *dev, static int pci171x_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s) { - const struct boardtype *this_board = comedi_board(dev); + const struct boardtype *this_board = dev->board_ptr; struct pci1710_private *devpriv = dev->private; switch (this_board->cardtype) { @@ -828,7 +828,7 @@ static int move_block_from_fifo(struct comedi_device *dev, static void pci1710_handle_fifo(struct comedi_device *dev, struct comedi_subdevice *s) { - const struct boardtype *this_board = comedi_board(dev); + const struct boardtype *this_board = dev->board_ptr; struct pci1710_private *devpriv = dev->private; struct comedi_cmd *cmd = &s->async->cmd; int m, samplesinbuf; @@ -907,7 +907,7 @@ static irqreturn_t interrupt_service_pci1710(int irq, void *d) return IRQ_HANDLED; } - if (cmd->flags & TRIG_WAKE_EOS) + if (cmd->flags & CMDF_WAKE_EOS) pci1710_handle_every_sample(dev, s); else pci1710_handle_fifo(dev, s); @@ -932,7 +932,7 @@ static int pci171x_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) s->async->cur_chan = 0; devpriv->CntrlReg &= Control_CNT0; - if ((cmd->flags & TRIG_WAKE_EOS) == 0) + if ((cmd->flags & CMDF_WAKE_EOS) == 0) devpriv->CntrlReg |= Control_ONEFH; devpriv->divisor1 = devpriv->next_divisor1; @@ -968,7 +968,7 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_cmd *cmd) { - const struct boardtype *this_board = comedi_board(dev); + const struct boardtype *this_board = dev->board_ptr; struct pci1710_private *devpriv = dev->private; int err = 0; unsigned int arg; @@ -1045,7 +1045,7 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev, */ static int pci171x_reset(struct comedi_device *dev) { - const struct boardtype *this_board = comedi_board(dev); + const struct boardtype *this_board = dev->board_ptr; struct pci1710_private *devpriv = dev->private; outw(0x30, dev->iobase + PCI171x_CNTCTRL); @@ -1102,7 +1102,7 @@ static int pci1720_reset(struct comedi_device *dev) */ static int pci1710_reset(struct comedi_device *dev) { - const struct boardtype *this_board = comedi_board(dev); + const struct boardtype *this_board = dev->board_ptr; switch (this_board->cardtype) { case TYPE_PCI1720: @@ -1250,9 +1250,7 @@ static void pci1710_detach(struct comedi_device *dev) { if (dev->iobase) pci1710_reset(dev); - if (dev->irq) - free_irq(dev->irq, dev); - comedi_pci_disable(dev); + comedi_pci_detach(dev); } static struct comedi_driver adv_pci1710_driver = { |