diff options
| author |   H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-11-04 10:55:07 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-07 09:34:04 -0800 |
| commit | ca26b42d4f8c5d9be2a4cc2bf66a19ff71ac036e (patch) | |
| tree | a2d5ec6de3daf420af6773056c61545d111a0df0 /drivers/staging/comedi/drivers/addi_apci_3120.c | |
| parent | staging: comedi: addi_apci_3120: tidy up apci3120_reset() (diff) | |
| download | linux-dev-ca26b42d4f8c5d9be2a4cc2bf66a19ff71ac036e.tar.xz linux-dev-ca26b42d4f8c5d9be2a4cc2bf66a19ff71ac036e.zip | |
staging: comedi: addi_apci_3120: move apci3120_reset() to driver source
Move this function from the included hwdrv_apci31210.c source file to
the main driver source file.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/addi_apci_3120.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/addi_apci_3120.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c index 7ad7621e74e0..79a96acc8b63 100644 --- a/drivers/staging/comedi/drivers/addi_apci_3120.c +++ b/drivers/staging/comedi/drivers/addi_apci_3120.c @@ -491,6 +491,18 @@ static void apci3120_dma_free(struct comedi_device *dev) } } +static void apci3120_reset(struct comedi_device *dev) +{ + /* disable all interrupt sources */ + outb(0, dev->iobase + APCI3120_MODE_REG); + + /* disable all counters, ext trigger, and reset scan */ + outw(0, dev->iobase + APCI3120_CTRL_REG); + + /* clear interrupt status */ + inw(dev->iobase + APCI3120_STATUS_REG); +} + static int apci3120_auto_attach(struct comedi_device *dev, unsigned long context) { |