Commits · 32502f5aa1cd4772d29eabdce1cf82985edcfadd · nexedi / linux

11 Sep, 2014 40 commits

staging: comedi: adl_pci9118: convert private data true/false flags to bit-fields · 32502f5a

H Hartley Sweeten authored Sep 09, 2014

For aesthetics convert the private data true/false flags to bit-fields. The
'usemux' member is used in the driver as a flag. Refactor the analog input
subdevice init so this member can also be a bit-field.
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>

32502f5a

staging: comedi: adl_pci9118: remove 'dmabuf_panic_size' from private data · f463b8c0

H Hartley Sweeten authored Sep 09, 2014

This member of the private data is only used in some #if 0'ed code. Remove
it along with the unused code.
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>

f463b8c0

staging: comedi: adl_pci9118: remove PCI9118_PARANOIDCHECK code · 006e81e2

H Hartley Sweeten authored Sep 09, 2014

The comment states that paramoid checks are broken. They also would only
work for 12-bit analog input samples.

Instead of fixing the paranoid checking just remove it to simplify the
driver a bit.
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>

006e81e2

staging: comedi: adl_pci9118: do cfc_handle_events() at end of interrupt · 45ada8e8

H Hartley Sweeten authored Sep 09, 2014

Each of the error detections currently do a cfc_handle_events() and exits
the interrupt handler if the error is detected. The DMA and non-DMA handlers
also to a cfc_handle_events().

For aesthetics, use goto to exit the interrupt handler if an error is detected
and move the cfc_handle_events() call to the end of the interrupt.
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>

45ada8e8

staging: comedi: adl_pci9118: handle hardware errors in interrupt handler · f16a7b85

H Hartley Sweeten authored Sep 09, 2014

Hardware errors will now always terminate an async command. For aesthetics,
absorb pci9118_decode_error_status() into the interrupt handler and use
the register map defines to remove the "magic" numbers. Refactor the code
to set the appropriate comedi event bits and handle the event.

Remove the unnecessary 'ai_maskerr' and 'ai_maskharderr' members from the
private data.
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>

f16a7b85

staging: comedi: adl_pci9118: handle error detection in main interrupt handler · fed2c840

H Hartley Sweeten authored Sep 09, 2014

The DMA and non-DMA both check the analog input status value to detect
hardware errors. For aesthetics, move the this detection into the main
interrupt handler. This allows removing the unused 'int_adstat' parameter
from the DMA and non-DMA handlers. In addition, the 'int_daq' parameter
is also not used so remove it also.
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>

fed2c840

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