- 15 Nov, 2012 40 commits
-
-
Bill Pemberton authored
The TIOCGSOFTCAR and TIOCSSOFTCAR ioctls are handled by the tty layer so the dgrp driver shouldn't try to deal with them itself. Signed-off-by:
Bill Pemberton <wfp5p@virginia.edu> Signed-off-by:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
Ian Abbott authored
Apart from the somewhat unnecessary `BUG_ON()` calls, `comedi_pci_auto_config()` and `comedi_usb_auto_config()` are just one-line wrappers around `comedi_auto_config()`, and `comedi_pci_auto_unconfig()` and `comedi_usb_auto_unconfig()` are just one-line wrappers around `comedi_auto_unconfig()`. Convert them to inline functions and remove the `BUG_ON()` calls. Signed-off-by:
Ian Abbott <abbotti@mev.co.uk> Signed-off-by:
-
Ian Abbott authored
No comedi drivers set the `attach_pci()` or `attach_usb()` handlers in their `struct comedi_driver` any longer as they have all been replaced with an `auto_attach()` handler. Also, no code calls the `attach_pci()` or `attach_usb()` handlers any longer. Remove them from `struct comedi_driver`. Signed-off-by:
-
Ian Abbott authored
`comedi_auto_config()` just calls internal function `comedi_auto_config_helper()`, passing it a wrapper function `comedi_auto_config_wrapper()` to handle the specifics of checking and calling the low-level comedi driver's `auto_attach()` handler. Since there are no other callers of `comedi_auto_config_helper()` or `comedi_auto_config_wrapper()`, combine everything into the single exported function `comedi_auto_config()`. Change the ordering of the check for existence of the low-level comedi driver's `auto_attach()` handler and the allocation of the comedi minor device number. This means the log message warning of the absence of the handler now has to be refer to the hardware device instead of the not-yet-allocated comedi device. Signed-off-by:
-
Ian Abbott authored
There is no need for `comedi_pci_auto_config()` and `comedi_usb_auto_config()` to check that `driver->auto_attach` is non-null before calling `comedi_auto_attach()` as this check is done by `comedi_auto_config()` itself (actually by `comedi_auto_config_wrapper()`). Remove the unnecessary checks. Signed-off-by:
-
Ian Abbott authored
All the Comedi drivers that call `comedi_usb_auto_config()` have replaced the `attach_usb()` handler in their `struct comedi_driver` with a `auto_attach()` handler, so there is no need to check for the existence of the `attach_usb()` handler any more. Remove this check and the code that calls it. Signed-off-by:
-
Ian Abbott authored
All the Comedi drivers that call `comedi_pci_auto_config()` have replaced the `attach_pci()` handler in their `struct comedi_driver` with a `auto_attach()` handler, so there is no need to check for the existence of the `attach_pci()` handler any more. Remove this check and the code that calls it. Signed-off-by:
-
Ian Abbott authored
All the Comedi drivers that call `comedi_pci_auto_config()` or `comedi_usb_auto_config()` define a `auto_attach()` handler in their `struct comedi_driver`. There is no need to fall back to abusing the `attach()` handler any more, so remove the code that supports that. Signed-off-by:
-
Ian Abbott authored
The 'addi_apci_1032' driver recently started supporting the `INSN_CONFIG_DIGITAL_TRIG` configuration instruction, but as no other drivers were using it before, there was no existing practice of how the instruction should look. Define the format to be something a bit more configurable. In particular, a subdevice might have more than one trigger requiring an ID and/or `COMEDI_EV_...` flags to disambiguate them, a trigger might have more than 32 inputs, and a trigger might need several `INSN_CONFIG_DIGITAL_TRIG` configuration instructions to configure completely (if there are more than 32 inputs or if it uses a combination of edge-triggered and level-triggered inputs). Signed-off-by:
-
Ian Abbott authored
The newly defined format for the `INSN_CONFIG_DIGITAL_TRIG` configuration instruction expects 6 data values. Check the length in `check_insn_config_length()` before calling the comedi subdevice's `insn_config` handler. Signed-off-by:
-
Ian Abbott authored
Conform to the new definition of the `INSN_CONFIG_DIGITAL_TRIG` configuration instruction. Return an error if the 'trigger number' in `data[1]` is non-zero or if the configuration operation in `data[2]` is not supported. Deal with the 'left-shift' amount in `data[3]`. The trigger's input channels can only be configured as a set of rising and falling edges ('OR' mode) or as a set of high and low levels ('AND' mode). Preserve the old input channels to the right of the 'left-shift' value except when switching modes. (The 'left-shift' support is a bit of an overkill for this driver since the trigger only has 16 input channels.) Signed-off-by: -
H Hartley Sweeten authored
Use the new helpers in the step 3 tests of ni_{ai,ao,cdio}_cmdtest(). Note that all the command triggers in ni_cdio_cmdtest are single source so the extra tests are not required. Signed-off-by:H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by:
-
H Hartley Sweeten authored
Use the new helpers in the step 3 tests of usbdux_{ai,ao}_cmdtest(). Also, remove some debug noise. Signed-off-by: -
H Hartley Sweeten authored
Use the new helpers in the step 3 tests of usbduxfast_ai_cmdtest(). Also, remove some debug noise. Signed-off-by:
-
H Hartley Sweeten authored
Use the new helpers in the step 3 tests of usbdux_{ai,ao}_cmdtest(). Also, remove some dev_dbg() noise. Signed-off-by: -
H Hartley Sweeten authored
Use the new helpers in the step 3 tests of skel_ai_cmdtest(). Signed-off-by:
-
H Hartley Sweeten authored
Use the new helpers in the step 3 tests of s626_ai_cmdtest(). Signed-off-by:
-
H Hartley Sweeten authored
Use the new helpers in the step 3 tests of rtd_ai_cmdtest(). Signed-off-by:
-
H Hartley Sweeten authored
Use the new helpers in the step 3 tests of daqp_ai_cmdtest(). Signed-off-by:
-
H Hartley Sweeten authored
Use the new helpers in the step 3 tests of ai_cmdtest(). Signed-off-by:
-
H Hartley Sweeten authored
Use the new helpers in the step 3 tests of pcl816_ai_cmdtest(). Signed-off-by:
-
H Hartley Sweeten authored
Use the new helpers in the step 3 tests of pcl812_ai_cmdtest(). Signed-off-by:
-
H Hartley Sweeten authored
Use the new helpers in the step 3 tests of pcl711_ai_cmdtest(). Signed-off-by:
-
H Hartley Sweeten authored
Use the new helpers in the step 3 tests of ni_tio_cmdtest(). Note that cmd->stop_src only has one trigger source so the extra test is not required. Signed-off-by:
-
H Hartley Sweeten authored
Use the new helpers in the step 3 tests of ni_pcidio_cmdtest(). Signed-off-by:
-
H Hartley Sweeten authored
Use the new helpers in the step 3 tests of labpc_ai_cmdtest(). Signed-off-by:
-
H Hartley Sweeten authored
Use the new helpers in the step 3 tests of atmio16d_ai_cmdtest(). Signed-off-by:
-
H Hartley Sweeten authored
Use the new helpers in the step 3 tests of a2150_ai_cmdtest(). Signed-off-by:
-
H Hartley Sweeten authored
Remove the dev_err() noise and convert the error handling to the normal form (err |= -EINVAL) used in the do_cmdtest functions. Signed-off-by:
-
H Hartley Sweeten authored
Use the new helpers in the step 3 tests of di_cmd_test(). Signed-off-by:
-
H Hartley Sweeten authored
Use the new helpers in the step 3 tests of dt3k_ai_cmdtest(). Signed-off-by:
-
H Hartley Sweeten authored
Use the new helpers in the step 3 tests of dt282x_{ai,ao}_cmdtest(). Signed-off-by: -
H Hartley Sweeten authored
Use the new helpers in the step 3 tests of dt2814_ai_cmdtest(). Signed-off-by:
-
H Hartley Sweeten authored
Use the new helpers in the step 3 tests of dmm32at_ai_cmdtest(). Signed-off-by:
-
H Hartley Sweeten authored
Use the new helpers in the step 3 tests of das1800_ai_do_cmdtest(). Signed-off-by:
-
H Hartley Sweeten authored
Use the new helpers in the step 3 tests of das16m1_cmd_test(). Signed-off-by:
-
H Hartley Sweeten authored
Use the new helpers in the step 3 tests of das16_cmd_test(). Signed-off-by:
-
H Hartley Sweeten authored
Use the new helpers in the step 3 tests of cb_pcidas_{ai,ao}_cmdtest(). Signed-off-by: -
H Hartley Sweeten authored
Use the new helpers in the step 3 tests of das16cs_ai_cmdtest(). Signed-off-by:
-
H Hartley Sweeten authored
Use the new helpers in the step 3 tests of pci230_{ao,ai}_cmdtest(). Signed-off-by:
-
