[PATCH 00/32] staging: comedi: continue async command cleanup

Ian Abbott abbotti at mev.co.uk
Wed Apr 30 09:13:15 UTC 2014


On 2014-04-29 20:59, H Hartley Sweeten wrote:
> Remove some unnecessary pacer divisor calculations. The divisors are calculated
> as part of the (*do_cmdtest) and don't need done in the (*do_cmd).
>
> Remomove the older, unused, divisor calc functions in 8253.h to avoid any
> confusion.
>
> Remove some unnecessary private data members in a couple drivers and the
> addi_common.h header.
>
> Tidy up hwdrv_apci3120 a bit.
>
> Fix a couple 8254 timer programming issues. As Ian Abbott pointed out,
> the i8254_load() function does not use the I8254_MODE* defines. Convert
> all drivers to use the i8254_set_mode()/i8254_write() sequence instead.
>
> v2: Fix some i8254_load() issued pointed out by Ian Abbott in patches
>      01, 02, 03, and 05.
>      Add a couple new patchs (24 thru 32) to fix/clarify the remaining
>      i8254_load() issues.
>
> H Hartley Sweeten (32):
>    staging: comedi: cb_pcidas: don't calc ai pacer divisors twice
>    staging: comedi: cb_pcidas: don't calc ao pacer divisors twice
>    staging: comedi: das16m1: don't calc pacer divisors twice
>    staging: comedi: das1800: refactor Step 4 of das1800_ai_do_cmdtest()
>    staging: comedi: das1800: don't calc pacer divisors twice
>    staging: comedi: 8253.h: rename i8253_cascade_ns_to_timer_2div()
>    staging: comedi: 8253.h: remove the unused i8253_cascade_ns_to_timer_*()
>    staging: comedi: adl_pci9111: tidy up (*do_cmdtest) Step 4
>    staging: comedi: addi_apci_2032: tidy up cmd use in apci2032_interrupt()
>    staging: comedi: amplc_pci224: remove 'ai_stop_continuous' from private data
>    staging: comedi: amplc_pci230: remove 'ai_continuous' from private data
>    staging: comedi: amplc_pci230: remove 'ao_continuous' from private data
>    staging: comedi: addi_common.h: remove 'ui_AiFlags' from private data
>    staging: comedi: addi_common.h: remove 'ui_AiScanLength' from private data
>    staging: comedi: addi_common.h: remove 'pui_AiChannelList' from private data
>    staging: comedi: addi_common.h: remove 'ui_AiTimer0' from private data
>    staging: comedi: addi_common.h: remove 'ui_AiTimer1' from private data
>    staging: comedi: addi_common.h: remove 'ui_AiDataLength' from private data
>    staging: comedi: addi_common.h: remove 'ui_AiNbrofScans' from private data
>    staging: comedi: addi_common.h: remove 'b_AiContinuous' from private data
>    staging: comedi: hwdrv_apci3120: cmd->convert_src is always TRIG_TIMER
>    staging: comedi: hwdrv_apci3120: fix 'b_AiCyclicAcquisition' usage
>    staging: comedi: hwdrv_apci3120: remove clearing of 'b_OutputMemoryStatus'
>    staging: comedi: pcl711: fix 8254 timer programming
>    staging: comedi: ni_at_ao: fix 8254 timer programming
>    staging: comedi: me4000: fix 8254 timer programming
>    staging: comedi: amplc_pci244: clarify 8254 timer programming
>    staging: comedi: das800: clarify 8254 timer programming
>    staging: comedi: ni_labpc: fix 8254 timer programming
>    staging: comedi: ni_at_a2150: clarify 8254 timer programming
>    staging: comedi: das16m1: clarify 8254 timer programming
>    staging: comedi: das16: clarify 8254 timer programming
>
>   drivers/staging/comedi/drivers/8253.h              | 105 +------------
>   .../staging/comedi/drivers/addi-data/addi_common.h |  10 +-
>   .../comedi/drivers/addi-data/hwdrv_apci3120.c      | 163 +++++++--------------
>   drivers/staging/comedi/drivers/addi_apci_2032.c    |  20 +--
>   drivers/staging/comedi/drivers/adl_pci9111.c       |  38 ++---
>   drivers/staging/comedi/drivers/amplc_pci224.c      |  30 ++--
>   drivers/staging/comedi/drivers/amplc_pci230.c      |  47 ++----
>   drivers/staging/comedi/drivers/cb_pcidas.c         |  49 +++----
>   drivers/staging/comedi/drivers/das16.c             |   7 +-
>   drivers/staging/comedi/drivers/das16m1.c           |  48 +++---
>   drivers/staging/comedi/drivers/das1800.c           | 147 ++++++-------------
>   drivers/staging/comedi/drivers/das800.c            |  21 +--
>   drivers/staging/comedi/drivers/me4000.c            |   8 +-
>   drivers/staging/comedi/drivers/ni_at_a2150.c       |   4 +-
>   drivers/staging/comedi/drivers/ni_at_ao.c          |   8 +-
>   drivers/staging/comedi/drivers/ni_labpc.c          |  92 +++++-------
>   drivers/staging/comedi/drivers/pcl711.c            |  19 ++-
>   17 files changed, 274 insertions(+), 542 deletions(-)
>

Looks good!

As a side node, I wonder if it's worth stripping out those `| 
I8254_BINARY` bits as it's basically 'OR'ing with zero anyway.

Reviewed-by: Ian Abbott <abbotti at mev.co.uk>

-- 
-=( Ian Abbott @ MEV Ltd.    E-mail: <abbotti at mev.co.uk>        )=-
-=( Tel: +44 (0)161 477 1898   FAX: +44 (0)161 718 3587         )=-


More information about the devel mailing list