Commit graph

361,345 commits

Author SHA1 Message Date
Ian Abbott
33cdce6293 staging: comedi: addi_apci_1032: conform to new INSN_CONFIG_DIGITAL_TRIG
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: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:25:08 -08:00
H Hartley Sweeten
c3be5c7f1e staging: comedi: ni_mio_common: use cfc_check_trigger_arg_*() helpers
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:20 -08:00
H Hartley Sweeten
7ec265905a staging: comedi: usbduxsigma: use cfc_check_trigger_arg_*() helpers
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 <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:20 -08:00
H Hartley Sweeten
9309c4772e staging: comedi: usbduxfast: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of usbduxfast_ai_cmdtest().

Also, remove some debug noise.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:20 -08:00
H Hartley Sweeten
f4d36c7a42 staging: comedi: usbdux: use cfc_check_trigger_arg_*() helpers
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 <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:19 -08:00
H Hartley Sweeten
0cd0b8fde1 staging: comedi: skel: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of skel_ai_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:19 -08:00
H Hartley Sweeten
53a254b92c staging: comedi: s626: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of s626_ai_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:19 -08:00
H Hartley Sweeten
8a2b08ec90 staging: comedi: rtd520: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of rtd_ai_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:19 -08:00
H Hartley Sweeten
42cae4a1c0 staging: comedi: quatech_daqp_cs: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of daqp_ai_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:19 -08:00
H Hartley Sweeten
8efdc1bf56 staging: comedi: pcl818: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of ai_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:19 -08:00
H Hartley Sweeten
b93e56ade2 staging: comedi: pcl816: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of pcl816_ai_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:18 -08:00
H Hartley Sweeten
4cd8672ab3 staging: comedi: pcl812: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of pcl812_ai_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:18 -08:00
H Hartley Sweeten
d1e27594ed staging: comedi: pcl711: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of pcl711_ai_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:18 -08:00
H Hartley Sweeten
aadd0132c5 staging: comedi: ni_tiocmd: use cfc_check_trigger_arg_*() helpers
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 <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:18 -08:00
H Hartley Sweeten
616a14d7ad staging: comedi: ni_pcidio: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of ni_pcidio_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:18 -08:00
H Hartley Sweeten
88c793010b staging: comedi: ni_labpc: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of labpc_ai_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:18 -08:00
H Hartley Sweeten
ec3ffe6d42 staging: comedi: ni_atmio16d: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of atmio16d_ai_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:17 -08:00
H Hartley Sweeten
dd254844f1 staging: comedi: ni_at_a2150: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of a2150_ai_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:17 -08:00
H Hartley Sweeten
8c6c5a692d staging: comedi: gsc_hpdi: cleanup step 3 of me4000_ai_do_cmd_test()
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 <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:17 -08:00
H Hartley Sweeten
bf1b2022ef staging: comedi: gsc_hpdi: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of di_cmd_test().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:17 -08:00
H Hartley Sweeten
39c7bba8cc staging: comedi: dt3000: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of dt3k_ai_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:17 -08:00
H Hartley Sweeten
61e55b88fd staging: comedi: dt282x: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of dt282x_{ai,ao}_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:17 -08:00
H Hartley Sweeten
2345dc8b0c staging: comedi: dt2814: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of dt2814_ai_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:16 -08:00
H Hartley Sweeten
e43ed5fa14 staging: comedi: dmm32at: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of dmm32at_ai_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:16 -08:00
H Hartley Sweeten
35402007dd staging: comedi: das1800: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of das1800_ai_do_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:16 -08:00
H Hartley Sweeten
050b3b1830 staging: comedi: das16m1: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of das16m1_cmd_test().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:16 -08:00
H Hartley Sweeten
a48e1258b4 staging: comedi: das16: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of das16_cmd_test().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:16 -08:00
H Hartley Sweeten
00d9c8cb5f staging: comedi: cb_pcidas: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of cb_pcidas_{ai,ao}_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:05 -08:00
H Hartley Sweeten
7d4adbe4f1 staging: comedi: cb_das16_cs: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of das16cs_ai_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:04 -08:00
H Hartley Sweeten
670c475cf0 staging: comedi: amplc_pci230: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of pci230_{ao,ai}_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:04 -08:00
H Hartley Sweeten
0427c4847e staging: comedi: amplc_pci224: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of pci224_ao_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:04 -08:00
H Hartley Sweeten
ad23feaa1e staging: comedi: adv_pci1710: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of pci171x_ai_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:04 -08:00
H Hartley Sweeten
1b44331348 staging: comedi: adl_pci9118: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of pci9118_ai_do_cmd_test().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:04 -08:00
H Hartley Sweeten
430f87dad7 staging: comedi: adl_pci9111: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of pci9111_ai_do_cmd_test().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:04 -08:00
H Hartley Sweeten
fa567598f0 staging: comedi: hwdrv_apci3120: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of i_APCI3120_CommandTestAnalogInput().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:03 -08:00
H Hartley Sweeten
df5daff81f staging: comedi: comedi_test: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of waveform_ai_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:03 -08:00
H Hartley Sweeten
50b825ffa3 staging: comedi: das800: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of das800_ai_do_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:03 -08:00
H Hartley Sweeten
c563065bb1 staging: comedi: pcm_common: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of comedi_pcm_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:03 -08:00
H Hartley Sweeten
5f93c88fe7 staging: comedi: ni_65xx: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of ni_65xx_intr_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:03 -08:00
H Hartley Sweeten
effa7a282e staging: comedi: ni_6527: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of ni6527_intr_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:03 -08:00
H Hartley Sweeten
7efbbc37db staging: comedi: amplc_pc236: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of pc236_intr_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:02 -08:00
H Hartley Sweeten
a1d6de5a98 staging: comedi: amplc_dio200: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of dio200_subdev_intr_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:02 -08:00
H Hartley Sweeten
58bed93eeb staging: comedi: addi_apci_1032: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of apci1032_cos_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:02 -08:00
H Hartley Sweeten
2404271050 staging: comedi: comedi_parport: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of parport_intr_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:02 -08:00
H Hartley Sweeten
851eef809c staging: comedi: 8255: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of subdev_8255_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:02 -08:00
H Hartley Sweeten
61ca8bac45 staging: comedi: comedi_fc.h: introduce new helpers for do_cmdtest step 3
Step 3 of the do_cmdtest functions validates the arguments for the
command to be executed. Most of these are simple tests to see if the
argument "is" a value, a "min" value, or a "max" value. Each of these
tests then clamps the argument to the value if it fails the test.

Introduce three new helper functions in comedi_fc.h to handle these
tests and remove the boilerplate code from the drivers.

The new helper functions are:

cfc_check_trigger_arg_is()  - argument must be == the value
cfc_check_trigger_arg_min() - argument must be >= the value
cfc_check_trigger_arg_max() - argument must be <= the value

All of these helpers set the argument to the value and return -EINVAL
if the validation fails.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-14 16:23:01 -08:00
Li RongQing
c75ea26040 ipv6: remove obsolete comments in route.c
Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-11-14 18:51:45 -05:00
Joachim Eastwood
3629a6cebc net/macb: clear unused address register
Only the first register set is used for matching but
we support getting the initial hw addr from any of
the registers.

To prevent stale entries and false matches clear unused
register sets. This most important for the at91_ether
driver where u-boot always uses the 2nd register set.

Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-11-14 18:51:03 -05:00
Joachim Eastwood
2dbfdbb912 net/macb: add support for phy irq via gpio pin
Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-11-14 18:51:02 -05:00
Joachim Eastwood
63f71dd026 net/phy/davicom: add irq functions to DM9161E and DM9161A
Both these PHYs support interrupt generation on IC pin 32.

Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-11-14 18:51:02 -05:00