Commit ca26b42d authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 884218c5
......@@ -72,18 +72,6 @@ static void apci3120_addon_write(struct comedi_device *dev,
outw((val >> 16) & 0xffff, devpriv->addon + APCI3120_ADDON_DATA_REG);
}
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_cancel(struct comedi_device *dev,
struct comedi_subdevice *s)
{
......
......@@ -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)
{
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment