linux.git/drivers/staging/comedi, branch v3.7-rc2

staging: comedi: jr3_pci: fix iomem dereference

2012-09-27T17:06:36+00:00

Correct a direct dereference of I/O memory to use an appropriate I/O
memory access function.  Note that the pointer being dereferenced is not
currently tagged with `__iomem` but I plan to correct that for 3.7.

Cc: stable 
Signed-off-by: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: drivers: use comedi_fc.h cmdtest helpers

2012-09-26T21:24:05+00:00

Use the cfc_check_trigger_src() helper for Step 1 in all the
driver cmdtest functions.

Use the cfc_check_trigger_is_unique() helper for Step 2 in all
the driver cmdtest functions. Note that single source triggers
do not need to be checked, they are already unique if they pass
Step 1.

For aesthetic reasons, change the comments in the cmdtest
functions for steps 1 and 2 so that they are all the same.

Signed-off-by: H Hartley Sweeten 
Cc: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: ni_mio_common: always lock in ni_ai_poll()

2012-09-26T17:45:38+00:00

`ni_ai_poll()` currently acquires (and later releases) the comedi
device's spin-lock iff `in_interrupt()` returns 0.  However, it is only
called during processing of a `COMEDI_POLL` ioctl so `in_interrupt()`
will always return 0 in this case.  Remove this test and acquire/release
the spin-lock unconditionally.  This eliminates a sparse warning about
different lock contexts for basic block.

Signed-off-by: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: s626: add FIXME comment

2012-09-26T17:45:38+00:00

`s626_enc_insn_config()` is the `insn_config()` handler for a counter
subdevice.  The `data[0]` value is supposed to be one of the
`INSN_CONFIG_...` constants defined in "comedi.h" indicating the type of
configuration instruction, but this function seems to be using it as a
variable value to preload the counter with.  Various values of `data[0]`
are going to cause `check_insn_config_length()` in the comedi core
("comedi_fops.c") to return an error, and this function won't be called
in those cases.  Most other values will log a warning to the kernel log.

It's not entirely clear what constant should be checked for in
`data[0]`, so add a "FIXME" comment for now.

Signed-off-by: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: s626: don't dereference insn->data

2012-09-26T17:45:38+00:00

`s626_enc_insn_config()` is incorrectly dereferencing `insn->data` which
is a pointer to user memory.  It should be dereferencing the separate
`data` parameter that points to a copy of the data in kernel memory.

Signed-off-by: Ian Abbott 
Reviewed-by: H Hartley Sweeten 
Cc: stable 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: s526: fix if() check in s526_gpct_winsn()

2012-09-26T17:21:43+00:00

This if() check was flipped from a test for valid data params
to a test for invalid params.

As pointed out by Dan Carpenter, the orignal test was:

	if ((data[1] > data[0]) && (data[0] > 0)) {

the flipped test should be:

	if (data[1] <= data[0]) ...

Add the missing '='.

Signed-off-by: H Hartley Sweeten 
Reported-by: Dan Carpenter 
Cc: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: s626: cleanup comments in s626_initialize()

2012-09-26T16:37:32+00:00

Cleanup the comments to follow the coding style of the kernel.

Signed-off-by: H Hartley Sweeten 
Cc: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: s626: remove clear of kzalloc'ed data

2012-09-26T16:37:32+00:00

The private data is kzalloc'ed. There is no need to set any
of the initial data to '0'.

Signed-off-by: H Hartley Sweeten 
Cc: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: s626: remove 'WDInterval' from private data

2012-09-26T16:37:32+00:00

This variable is never used in the driver. Just remove it.

Signed-off-by: H Hartley Sweeten 
Cc: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: s626: remove 'ChargeEnabled' from private data

2012-09-26T16:37:32+00:00

This variable is never used in the driver. Just remove it.

Signed-off-by: H Hartley Sweeten 
Cc: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman