[PATCH 00/49] staging: comedi: cleanup pci device detection

H Hartley Sweeten hsweeten at visionengravers.com
Tue Mar 5 16:52:35 UTC 2013


Make use of the 'context' in the comedi auto config by passing the
pci_device_id 'driver_data' as the 'context'. Modify all the comedi_driver
pci drivers so that the 'driver_data' is an enum to the boardinfo entries.
This removes the need for the helper functions that matched the pci
vendor/device ids in the boardinfo against the pci_device in order to
locate the boardinfo. It also removes the need to carry the pci vendor/device
ids in the boardinfo.

H Hartley Sweeten (49):
  staging: comedi: comedi_pci: change the comedi_pci_auto_config() 'context'
  staging: comedi: 8255_pci: use the pci id_table 'driver_data'
  staging: comedi: addi_apci_1516: use the pci id_table 'driver_data'
  staging: comedi: addi_apci_16xx: use the pci id_table 'driver_data'
  staging: comedi: addi_apci_16xx: remove the boardinfo from the comedi_driver
  staging: comedi: addi_apci_3120: use the pci id_table 'driver_data'
  staging: comedi: adl_pci6208: use the pci id_table 'driver_data'
  staging: comedi: adl_pci7x3x: use the pci id_table 'driver_data'
  staging: comedi: adv_pci1710: use the pci id_table 'driver_data'
  staging: comedi: adv_pci_dio: use the pci id_table 'driver_data'
  staging: comedi: cb_pcidas: use the pci id_table 'driver_data'
  staging: comedi: cb_pcidas64: use the pci id_table 'driver_data'
  staging: comedi: cb_pcidas64: cleanup the boardinfo
  staging: comedi: cb_pcidda: use the pci id_table 'driver_data'
  staging: comedi: dt3000: use the pci id_table 'driver_data'
  staging: comedi: me4000: use the pci id_table 'driver_data'
  staging: comedi: me_daq: use the pci id_table 'driver_data'
  staging: comedi: ni_6527: cleanup pci_driver declaration
  staging: comedi: ni_6527: use the pci id_table 'driver_data'
  staging: comedi: ni_65xx: cleanup pci_driver declaration
  staging: comedi: ni_65xx: use the pci id_table 'driver_data'
  staging: comedi: ni_65xx: remove board() helper function
  staging: comedi: ni_65xx: remove n_ni_65xx_boards macro
  staging: comedi: ni_65xx: cleanup the boardinfo
  staging: comedi: ni_660x: use the pci id_table 'driver_data'
  staging: comedi: ni_660x: cleanup the boardinfo
  staging: comedi: ni_670x: use the pci id_table 'driver_data'
  staging: comedi: ni_pcidio: use the pci id_table 'driver_data'
  staging: comedi: ni_pcidio: remove n_ndio_boards macro
  staging: comedi: ni_pcidio: remove this_board macro
  staging: comedi: ni_pcimio: use the pci id_table 'driver_data'
  staging: comedi: ni_stc.h: remove boardtype macro
  staging: comedi: ni_stc.h: remove n_ni_boards macro
  staging: comedi: ni_pcimio: cleanup the boardinfo
  staging: comedi: rtd520: use the pci id_table 'driver_data'
  staging: comedi: skel: cleanup pci_driver declaration
  staging: comedi: skel: use the pci id_table 'driver_data'
  staging: comedi: skel: cleanup the boardinfo
  staging: comedi: addi_common: allow driver to set the board_ptr
  staging: comedi: addi_apci_035: set board_ptr before calling addi_auto_attach()
  staging: comedi: addi_apci_1500: set board_ptr before calling addi_auto_attach()
  staging: comedi: addi_apci_1564: set board_ptr before calling addi_auto_attach()
  staging: comedi: addi_apci_3200: use the pci id_table 'driver_data'
  staging: comedi: addi_apci_3xxx: use the pci id_table 'driver_data'
  staging: comedi: addi_common: remove addi_find_boardinfo()
  staging: comedi: addi_apci_1710: remove 'interrupt' from boardinfo
  staging: comedi: addi_apci_1710: remove boardinfo
  staging: comedi: addi_common: remove 'i_VendorId' and 'i_Device Id'
  staging: comedi: das08: remove 'id' from boardinfo

 drivers/staging/comedi/comedi_pci.c                |    6 +-
 drivers/staging/comedi/comedidev.h                 |    3 +-
 drivers/staging/comedi/drivers/8255_pci.c          |  160 +-
 .../staging/comedi/drivers/addi-data/addi_common.c |   23 +-
 .../staging/comedi/drivers/addi-data/addi_common.h |    2 -
 drivers/staging/comedi/drivers/addi_apci_035.c     |   19 +-
 drivers/staging/comedi/drivers/addi_apci_1032.c    |    4 +-
 drivers/staging/comedi/drivers/addi_apci_1500.c    |   19 +-
 drivers/staging/comedi/drivers/addi_apci_1516.c    |   56 +-
 drivers/staging/comedi/drivers/addi_apci_1564.c    |   19 +-
 drivers/staging/comedi/drivers/addi_apci_16xx.c    |   55 +-
 drivers/staging/comedi/drivers/addi_apci_1710.c    |   40 +-
 drivers/staging/comedi/drivers/addi_apci_2032.c    |    4 +-
 drivers/staging/comedi/drivers/addi_apci_2200.c    |    4 +-
 drivers/staging/comedi/drivers/addi_apci_3120.c    |   44 +-
 drivers/staging/comedi/drivers/addi_apci_3200.c    |   49 +-
 drivers/staging/comedi/drivers/addi_apci_3501.c    |    4 +-
 drivers/staging/comedi/drivers/addi_apci_3xxx.c    |  225 ++-
 drivers/staging/comedi/drivers/adl_pci6208.c       |   49 +-
 drivers/staging/comedi/drivers/adl_pci7x3x.c       |   81 +-
 drivers/staging/comedi/drivers/adl_pci8164.c       |    5 +-
 drivers/staging/comedi/drivers/adl_pci9111.c       |    5 +-
 drivers/staging/comedi/drivers/adl_pci9118.c       |    5 +-
 drivers/staging/comedi/drivers/adv_pci1710.c       |   97 +-
 drivers/staging/comedi/drivers/adv_pci1723.c       |    5 +-
 drivers/staging/comedi/drivers/adv_pci_dio.c       |  156 +-
 drivers/staging/comedi/drivers/amplc_dio200.c      |    6 +-
 drivers/staging/comedi/drivers/amplc_pc236.c       |    5 +-
 drivers/staging/comedi/drivers/amplc_pc263.c       |    6 +-
 drivers/staging/comedi/drivers/amplc_pci224.c      |    6 +-
 drivers/staging/comedi/drivers/amplc_pci230.c      |    5 +-
 drivers/staging/comedi/drivers/cb_pcidas.c         |   85 +-
 drivers/staging/comedi/drivers/cb_pcidas64.c       |  911 +++++----
 drivers/staging/comedi/drivers/cb_pcidda.c         |   81 +-
 drivers/staging/comedi/drivers/cb_pcimdas.c        |    5 +-
 drivers/staging/comedi/drivers/cb_pcimdda.c        |    5 +-
 drivers/staging/comedi/drivers/contec_pci_dio.c    |    5 +-
 drivers/staging/comedi/drivers/daqboard2000.c      |    5 +-
 drivers/staging/comedi/drivers/das08.h             |    1 -
 drivers/staging/comedi/drivers/das08_cs.c          |    1 -
 drivers/staging/comedi/drivers/das08_pci.c         |    6 +-
 drivers/staging/comedi/drivers/dt3000.c            |   88 +-
 drivers/staging/comedi/drivers/dyna_pci10xx.c      |    5 +-
 drivers/staging/comedi/drivers/gsc_hpdi.c          |    4 +-
 drivers/staging/comedi/drivers/icp_multi.c         |    4 +-
 drivers/staging/comedi/drivers/jr3_pci.c           |    4 +-
 drivers/staging/comedi/drivers/ke_counter.c        |    5 +-
 drivers/staging/comedi/drivers/me4000.c            |  135 +-
 drivers/staging/comedi/drivers/me_daq.c            |   51 +-
 drivers/staging/comedi/drivers/ni_6527.c           |   77 +-
 drivers/staging/comedi/drivers/ni_65xx.c           |  378 ++--
 drivers/staging/comedi/drivers/ni_660x.c           |   91 +-
 drivers/staging/comedi/drivers/ni_670x.c           |   57 +-
 drivers/staging/comedi/drivers/ni_labpc.c          |    4 +-
 drivers/staging/comedi/drivers/ni_mio_common.c     |  343 ++--
 drivers/staging/comedi/drivers/ni_pcidio.c         |   61 +-
 drivers/staging/comedi/drivers/ni_pcimio.c         | 2049 +++++++++-----------
 drivers/staging/comedi/drivers/ni_stc.h            |    4 -
 drivers/staging/comedi/drivers/rtd520.c            |   42 +-
 drivers/staging/comedi/drivers/s626.c              |    4 +-
 drivers/staging/comedi/drivers/skel.c              |  111 +-
 61 files changed, 2712 insertions(+), 3077 deletions(-)

-- 
1.8.1.4




More information about the devel mailing list