diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2015-01-14 10:05:10 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-17 14:32:55 -0800 |
| commit | cf0438c9c3da2f243961561d1e3742519b2eeb3d (patch) | |
| tree | dd7138505c16f3975d2e35a84cdf04c5318fd140 /drivers/staging/comedi/drivers/ni_labpc.h | |
| parent | 1a97f144e3d3e9d7efc5c0837bed016da9ae43c7 (diff) | |
staging: comedi: ni_labpc_isadma: use comedi_isdma module
The labpc driver has already had the depends on ISA_DMA_API limitation removed
by moving all the DMA support code into the labpc_isadma module.
For aesthetics, use the comedi_isadma module to provide the actual ISA DMA
support.
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/ni_labpc.h')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_labpc.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/staging/comedi/drivers/ni_labpc.h b/drivers/staging/comedi/drivers/ni_labpc.h index c26d7ee16071..be89ae479afc 100644 --- a/drivers/staging/comedi/drivers/ni_labpc.h +++ b/drivers/staging/comedi/drivers/ni_labpc.h @@ -34,14 +34,9 @@ struct labpc_boardinfo { unsigned is_labpc1200:1; /* has extra regs compared to pc+ */ }; -struct labpc_dma_desc { - unsigned int chan; /* DMA channel */ - void *virt_addr; /* virtual address of DMA buffer */ - dma_addr_t hw_addr; /* hardware (bus) address of DMA buffer */ - unsigned int size; /* size of DMA transfer (in bytes) */ -}; - struct labpc_private { + struct comedi_isadma *dma; + /* number of data points left to be taken */ unsigned long long count; /* software copys of bits written to command registers */ @@ -69,8 +64,6 @@ struct labpc_private { */ unsigned int divisor_b1; - struct labpc_dma_desc dma_desc; - /* we are using dma/fifo-half-full/etc. */ enum transfer_type current_transfer; /* |