Commits · 318141a18f7337338451512cc37ada3bf0a22ae6 · nexedi / linux · GitLab

11 Sep, 2014 40 commits

staging: comedi: adl_pci9118: handle master/target abort in main interrupt handler · 318141a1

H Hartley Sweeten authored Sep 09, 2014

For aesthetics, move the master/target abort detection from the DMA handler to the
main interrupt handler. This allows removing the unused 'int_amcc' parameter from
the DMA and non-DMA handlers.
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>

318141a1

staging: comedi: adl_pci9118: don't ignore hardware errors · 9e531485

H Hartley Sweeten authored Sep 09, 2014

The legacy (*attach) currently allows the user to pass a mask of error conditions
to ignore when running async commands. Remove this support so that the async
command is always terminated if the hardware reports an error.
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>

9e531485

staging: comedi: adl_pci9118: always try to use interrupt and DMA · cb578327

H Hartley Sweeten authored Sep 09, 2014

This driver currently supports both the (*auto_attach) and legacy (*attach)
mechanisms. The (*auto_attach) always tries to use the interrupt and DMA to
support async commands with the analog input subdevice. The legacy (*attach)
only enables them depending on a user option that is passed to the (*attach).
The 'default' (i.e. option == 0) is to enable both the interrupt and DMA.

Simplify the attach by always trying to enable the interrupt and DMA.
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>

cb578327

staging: comedi: adl_pci9118: DMA requires an interrupt · 6cf6b367

H Hartley Sweeten authored Sep 09, 2014

In order for DMA to work we also need an interrupt. Refactor the code
so that the DMA allocation is only done if the interrupt is available.
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>

6cf6b367

staging: comedi: adl_pci9118: factor out DMA alloc/free · b9ca5508

H Hartley Sweeten authored Sep 09, 2014

For aesthetics, factor the DMA allocation/free code out of the attach
and detach functions.
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>

b9ca5508

staging: comedi: vmk80xx: replace comedi_board() calls · 957b9f8b

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

957b9f8b

staging: comedi: rti800: replace comedi_board() calls · 723b68a9

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

723b68a9

staging: comedi: rtd520: replace comedi_board() calls · 3afadfa5

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

3afadfa5

staging: comedi: pcmuio: replace comedi_board() calls · 3bb22169

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

3bb22169

staging: comedi: pcmad: replace comedi_board() calls · 3230e42a

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

3230e42a

staging: comedi: pcl818: replace comedi_board() calls · dc453864

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

dc453864

staging: comedi: pcl816: replace comedi_board() calls · 79c9f68f

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

79c9f68f

staging: comedi: pcl812: replace comedi_board() calls · f7c9874b

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

f7c9874b

staging: comedi: pcl730: replace comedi_board() calls · 81fec905

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

81fec905

staging: comedi: pcl726: replace comedi_board() calls · 334e2f59

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

334e2f59

staging: comedi: pcl724: replace comedi_board() calls · 411b6f89

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

411b6f89

staging: comedi: pcl711: replace comedi_board() calls · b825f6c3

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

b825f6c3

staging: comedi: ni_pcimio: replace comedi_board() calls · 068be499

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

068be499

staging: comedi: ni_mio_common: replace comedi_board() calls · 7cf94adc

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

7cf94adc

staging: comedi: ni_labpc_isadma: replace comedi_board() calls · 765c8b03

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

765c8b03

staging: comedi: ni_labpc_common: replace comedi_board() calls · 8cf27116

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

8cf27116

staging: comedi: ni_atmio: replace comedi_board() calls · af169cf1

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

af169cf1

staging: comedi: ni_atmio16d: replace comedi_board() calls · 967b3eb2

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

967b3eb2

staging: comedi: ni_at_ao: replace comedi_board() calls · 3ec68b50

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

3ec68b50

staging: comedi: ni_at_a2150: replace comedi_board() calls · 02cf9703

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

02cf9703

staging: comedi: ni_660x: replace comedi_board() calls · da8e2a52

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

da8e2a52

staging: comedi: ni_65xx: replace comedi_board() calls · 369f87fa

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

369f87fa

staging: comedi: me4000: replace comedi_board() calls · acaf8a5d

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

acaf8a5d

staging: comedi: dt3000: replace comedi_board() calls · c3972570

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

c3972570

staging: comedi: dt282x: replace comedi_board() calls · a4759d39

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

a4759d39

staging: comedi: dt2811: replace comedi_board() calls · a5a74074

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

a5a74074

staging: comedi: dt2801: replace comedi_board() calls · 36ecf003

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

36ecf003

staging: comedi: das800: replace comedi_board() calls · b7793094

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

b7793094

staging: comedi: das6402: replace comedi_board() calls · 19924ce0

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

19924ce0

staging: comedi: das1800: replace comedi_board() calls · e0dd99bd

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

e0dd99bd

staging: comedi: das16: replace comedi_board() calls · 7a5bd23d

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

7a5bd23d

staging: comedi: das08_isa: replace comedi_board() calls · c86b98a2

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

c86b98a2

staging: comedi: das08: replace comedi_board() calls · 3fad0eb2

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

3fad0eb2

staging: comedi: cb_pcidas: replace comedi_board() calls · fa8e8c8b

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

fa8e8c8b

staging: comedi: cb_pcidas64: replace comedi_board() calls · 3bc86feb

Ian Abbott authored Sep 09, 2014

The `comedi_board(dev)` inline function calls just return
`dev->board_ptr`.  Expand the inline function calls.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

3bc86feb