platform/kernel/linux-stable.git
10 years agostaging: comedi: ni_65xx: remove commented out local variable
H Hartley Sweeten [Tue, 27 May 2014 17:30:53 +0000 (10:30 -0700)]
staging: comedi: ni_65xx: remove commented out local variable

This function does not use the comedi_cmd. Remove the commented out
local variable.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: mite: tidy up local variables in mite_sync_output_dma()
H Hartley Sweeten [Tue, 27 May 2014 17:30:52 +0000 (10:30 -0700)]
staging: comedi: mite: tidy up local variables in mite_sync_output_dma()

Tidy up the local variables so that the comedi_cmd is accessed as a pointer
instead of getting to it from the comedi_async pointer.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: das1800: use comedi_cmd pointer
H Hartley Sweeten [Tue, 27 May 2014 17:30:51 +0000 (10:30 -0700)]
staging: comedi: das1800: use comedi_cmd pointer

Use the local variable to access the comedi_cmd as a pointer instead
of getting to it from the comedi_subdevice pointer.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: cb_pcidas: use comedi_cmd pointer
H Hartley Sweeten [Tue, 27 May 2014 17:30:50 +0000 (10:30 -0700)]
staging: comedi: cb_pcidas: use comedi_cmd pointer

Use the local variable to access the comedi_cmd as a pointer instead
of getting to it from the comedi_async pointer.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: amplc_pci230: use comedi_cmd pointer
H Hartley Sweeten [Tue, 27 May 2014 17:30:49 +0000 (10:30 -0700)]
staging: comedi: amplc_pci230: use comedi_cmd pointer

Use the local variable to access the comedi_cmd as a pointer in
pci230_handle_ai() instead of getting to it from the comedi_async
pointer.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: amplc_pci224: use comedi_cmd pointer
H Hartley Sweeten [Tue, 27 May 2014 17:30:48 +0000 (10:30 -0700)]
staging: comedi: amplc_pci224: use comedi_cmd pointer

Use the local variable to access the comedi_cmd as a pointer in
pci224_ao_munge() instead of getting to it from the comedi_async
pointer.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: amplc_dio200_common: use comedi_cmd pointer
H Hartley Sweeten [Tue, 27 May 2014 17:30:47 +0000 (10:30 -0700)]
staging: comedi: amplc_dio200_common: use comedi_cmd pointer

Use the local variable to access the comedi_cmd as a pointer
in dio200_read_scan_intr() instead of getting to it from the
comedi_subdevice pointer.

Remove the unnecessary local variable 'len', this is just the
cmd->chanlist_len.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: das800: remove 'forever' from private data
H Hartley Sweeten [Tue, 27 May 2014 17:30:46 +0000 (10:30 -0700)]
staging: comedi: das800: remove 'forever' from private data

This member of the private data can be determined from the
cmd->stop_src. Do that instead.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: das800: add a local var for the comedi_cmd pointer
H Hartley Sweeten [Tue, 27 May 2014 17:30:45 +0000 (10:30 -0700)]
staging: comedi: das800: add a local var for the comedi_cmd pointer

For aesthetics, use a local variable to access the comedi_cmd as a
pointer in das800_ai_do_cmd() instead of getting to it from the
comedi_async pointer.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: usbduxsigma: remove 'ao_chanlist' from private data
H Hartley Sweeten [Tue, 27 May 2014 17:30:44 +0000 (10:30 -0700)]
staging: comedi: usbduxsigma: remove 'ao_chanlist' from private data

This member of the private data is just a copy of the channels from
the cmd->chanlist. Remove the member and just use the cmd->chanlist
directly.

Remove the unneeded 'len' local variable in usbduxsigma_ao_urb_complete().
This is just the cmd->chanlist_len.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: usbdux: use 'cmd' pointer in usbduxsub_ai_isoc_irq()
H Hartley Sweeten [Tue, 27 May 2014 17:30:43 +0000 (10:30 -0700)]
staging: comedi: usbdux: use 'cmd' pointer in usbduxsub_ai_isoc_irq()

Use the 'cmd' pointer to access the chanlist instead of getting to it
using the comedi_subdevice pointer.

Remove the unneeded 'n' local variable, this is just the cmd->chanlist_len.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: usbdux: remove 'ao_chanlist' from private data
H Hartley Sweeten [Tue, 27 May 2014 17:30:42 +0000 (10:30 -0700)]
staging: comedi: usbdux: remove 'ao_chanlist' from private data

This member of the private data is just a copy of the channels from
the cmd->chanlist. Remove the member and just use the cmd->chanlist
directly.

Remove the unneeded 'len' local variable in usbdux_ao_isoc_irq().
This is just the cmd->chanlist_len.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: usbduxsigma: remove 'ao_continuous' from private data
H Hartley Sweeten [Tue, 27 May 2014 17:30:41 +0000 (10:30 -0700)]
staging: comedi: usbduxsigma: remove 'ao_continuous' from private data

This member of the private data can be determined from the cmd->stop_src.
Do that instead.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: usbduxsigma: remove 'ai_continuous' from private data
H Hartley Sweeten [Tue, 27 May 2014 17:30:40 +0000 (10:30 -0700)]
staging: comedi: usbduxsigma: remove 'ai_continuous' from private data

This member of the private data can be determined from the cmd->stop_src.
Do that instead.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: usbduxfast: remove 'ai_continuous' from private data
H Hartley Sweeten [Tue, 27 May 2014 17:30:39 +0000 (10:30 -0700)]
staging: comedi: usbduxfast: remove 'ai_continuous' from private data

This member of the private data can be determined from the cmd->stop_src.
Do that instead.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: usbdux: remove 'ao_continuous' from private data
H Hartley Sweeten [Tue, 27 May 2014 17:30:38 +0000 (10:30 -0700)]
staging: comedi: usbdux: remove 'ao_continuous' from private data

This member of the private data can be determined from the cmd->stop_src.
Do that instead.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: usbdux: remove 'ai_continuous' from private data
H Hartley Sweeten [Tue, 27 May 2014 17:30:37 +0000 (10:30 -0700)]
staging: comedi: usbdux: remove 'ai_continuous' from private data

This member of the private data can be determined from the cmd->stop_src.
Do that instead.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: addi_apci_3xxx: use comedi_fc helpers to validate timer arg
H Hartley Sweeten [Tue, 27 May 2014 17:13:01 +0000 (10:13 -0700)]
staging: comedi: addi_apci_3xxx: use comedi_fc helpers to validate timer arg

Use the comedi_fc helper cfc_check_trigger_arg_is() to validate the
trigger argument when the source is TRIG_TIMER.

For aesthetics, rename the local variable 'tmp' to 'arg'.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: skel: use comedi_fc helpers to validate timer args
H Hartley Sweeten [Tue, 27 May 2014 17:13:00 +0000 (10:13 -0700)]
staging: comedi: skel: use comedi_fc helpers to validate timer args

Use the comedi_fc helper cfc_check_trigger_arg_is() to validate the
trigger arguments when the source is TRIG_TIMER.

Use cfc_check_trigger_arg_min() to vaidate the scan_begin_arg when the
scan_begin_src and convert_src are both TRIG_TIMER.

All the arguments are unsigned int, change the local variable to an
unsigned int and rename it for aesthetic reasons.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: s626: use comedi_fc helpers to validate timer args
H Hartley Sweeten [Tue, 27 May 2014 17:12:59 +0000 (10:12 -0700)]
staging: comedi: s626: use comedi_fc helpers to validate timer args

Use the comedi_fc helper cfc_check_trigger_arg_is() to validate the
trigger arguments when the source is TRIG_TIMER.

Use cfc_check_trigger_arg_min() to vaidate the scan_begin_arg when the
scan_begin_src and convert_src are both TRIG_TIMER.

All the arguments are unsigned int, change the local variable to an
unsigned int and rename it for aesthetic reasons.

Change the type of the first parameter to s626_ns_to_timer() to remove
the need for the casts.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: rtd520: use comedi_fc helpers to validate timer args
H Hartley Sweeten [Tue, 27 May 2014 17:12:58 +0000 (10:12 -0700)]
staging: comedi: rtd520: use comedi_fc helpers to validate timer args

Use the comedi_fc helper cfc_check_trigger_arg_is() to validate the
trigger arguments when the source is TRIG_TIMER.

Use cfc_check_trigger_arg_min() to vaidate the scan_begin_arg when the
scan_begin_src and convert_src are both TRIG_TIMER.

All the arguments are unsigned int, change the local variable to an
unsigned int and rename it for aesthetic reasons.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: quatech_daqp_cs: use comedi_fc helpers to validate timer args
H Hartley Sweeten [Tue, 27 May 2014 17:12:57 +0000 (10:12 -0700)]
staging: comedi: quatech_daqp_cs: use comedi_fc helpers to validate timer args

Use the comedi_fc helper cfc_check_trigger_arg_is() to validate the
trigger arguments when the source is TRIG_TIMER.

All the arguments are unsigned int, change the local variable to an
unsigned int and rename it for aesthetic reasons.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: pcl818: use comedi_fc helpers to validate timer arg
H Hartley Sweeten [Tue, 27 May 2014 17:12:56 +0000 (10:12 -0700)]
staging: comedi: pcl818: use comedi_fc helpers to validate timer arg

Use the comedi_fc helper cfc_check_trigger_arg_is() to validate the
trigger argument when the source is TRIG_TIMER.

The minimum test is not needed, this was already validated in Step 3.

All the arguments are unsigned int, change the local variable to an
unsigned int and rename it for aesthetic reasons.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: pcl816: use comedi_fc helpers to validate timer arg
H Hartley Sweeten [Tue, 27 May 2014 17:12:55 +0000 (10:12 -0700)]
staging: comedi: pcl816: use comedi_fc helpers to validate timer arg

Use the comedi_fc helper cfc_check_trigger_arg_is() to validate the
trigger argument when the source is TRIG_TIMER.

The minimum test is not needed, this was already validated in Step 3.

All the arguments are unsigned int, change the local variable to an
unsigned int and rename it for aesthetic reasons.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: pcl812: use comedi_fc helpers to validate timer arg
H Hartley Sweeten [Tue, 27 May 2014 17:12:54 +0000 (10:12 -0700)]
staging: comedi: pcl812: use comedi_fc helpers to validate timer arg

Use the comedi_fc helper cfc_check_trigger_arg_is() to validate the
trigger argument when the source is TRIG_TIMER.

The minimum test is not needed, this was already validated in Step 3.

All the arguments are unsigned int, change the local variable to an
unsigned int and rename it for aesthetic reasons.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: pcl711: use comedi_fc helpers to validate timer arg
H Hartley Sweeten [Tue, 27 May 2014 17:12:53 +0000 (10:12 -0700)]
staging: comedi: pcl711: use comedi_fc helpers to validate timer arg

Use the comedi_fc helper cfc_check_trigger_arg_is() to validate the
trigger argument when the source is TRIG_TIMER.

All the arguments are unsigned int, change the local variable to an
unsigned int and rename it for aesthetic reasons.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: ni_pcidio: use comedi_fc helpers to validate timer arg
H Hartley Sweeten [Tue, 27 May 2014 17:12:52 +0000 (10:12 -0700)]
staging: comedi: ni_pcidio: use comedi_fc helpers to validate timer arg

Use the comedi_fc helper cfc_check_trigger_arg_is() to validate the
trigger argument when the source is TRIG_TIMER.

All the arguments are unsigned int, change the local variable to an
unsigned int and rename it for aesthetic reasons.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: ni_at_a2150: use comedi_fc helpers to validate timer arg
H Hartley Sweeten [Tue, 27 May 2014 17:12:51 +0000 (10:12 -0700)]
staging: comedi: ni_at_a2150: use comedi_fc helpers to validate timer arg

Use the comedi_fc helper cfc_check_trigger_arg_is() to validate the
trigger argument when the source is TRIG_TIMER.

All the arguments are unsigned int, change the local variable to an
unsigned int and rename it for aesthetic reasons.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: dt282x: use comedi_fc helpers to validate timer args
H Hartley Sweeten [Tue, 27 May 2014 17:12:50 +0000 (10:12 -0700)]
staging: comedi: dt282x: use comedi_fc helpers to validate timer args

Use the comedi_fc helper cfc_check_trigger_arg_is() to validate the
trigger arguments when the source is TRIG_TIMER.

All the arguments are unsigned int, change the local variable to an
unsigned int and rename it for aesthetic reasons.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: dt2814: use comedi_fc helpers to validate timer arg
H Hartley Sweeten [Tue, 27 May 2014 17:12:49 +0000 (10:12 -0700)]
staging: comedi: dt2814: use comedi_fc helpers to validate timer arg

Use the comedi_fc helper cfc_check_trigger_arg_is() to validate the
trigger argument when the source is TRIG_TIMER.

All the arguments are unsigned int, change the local variable to an
unsigned int and rename it for aesthetic reasons.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: dmm32at: use comedi_fc helpers to validate timer args
H Hartley Sweeten [Tue, 27 May 2014 17:12:48 +0000 (10:12 -0700)]
staging: comedi: dmm32at: use comedi_fc helpers to validate timer args

Use the comedi_fc helper cfc_check_trigger_arg_is() to validate the
trigger arguments when the source is TRIG_TIMER.

Use cfc_check_trigger_arg_min() to vaidate the scan_begin_arg when the
scan_begin_src and convert_src are both TRIG_TIMER.

All the arguments are unsigned int, change the local variable to an
unsigned int and rename it for aesthetic reasons.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: das800: use comedi_fc helpers to validate timer args
H Hartley Sweeten [Tue, 27 May 2014 17:12:47 +0000 (10:12 -0700)]
staging: comedi: das800: use comedi_fc helpers to validate timer args

Use the comedi_fc helper cfc_check_trigger_arg_is() to validate the
trigger arguments when the source is TRIG_TIMER.

All the arguments are unsigned int, change the local variable to an
unsigned int and rename it for aesthetic reasons.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: das16m1: use comedi_fc helpers to validate timer args
H Hartley Sweeten [Tue, 27 May 2014 17:12:46 +0000 (10:12 -0700)]
staging: comedi: das16m1: use comedi_fc helpers to validate timer args

Use the comedi_fc helper cfc_check_trigger_arg_is() to validate the
trigger arguments when the source is TRIG_TIMER.

For aesthetics, rename the local variable 'tmp' to 'arg'.

Also, change the 'err' variable to the correct type.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: das16: use comedi_fc helpers to validate timer args
H Hartley Sweeten [Tue, 27 May 2014 17:12:45 +0000 (10:12 -0700)]
staging: comedi: das16: use comedi_fc helpers to validate timer args

Use the comedi_fc helper cfc_check_trigger_arg_is() to validate the
trigger arguments when the source is TRIG_TIMER.

Tidy up the local varaibles in the function.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: comedi_test: use comedi_fc helpers to validate timer args
H Hartley Sweeten [Tue, 27 May 2014 17:12:44 +0000 (10:12 -0700)]
staging: comedi: comedi_test: use comedi_fc helpers to validate timer args

Use the comedi_fc helper cfc_check_trigger_arg_is() to validate the
trigger arguments when the source is TRIG_TIMER.

All the arguments are unsigned int, change the local variable to an
unsigned int and rename it for aesthetic reasons.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: cb_pcidas: use comedi_fc helpers to validate timer args
H Hartley Sweeten [Tue, 27 May 2014 17:12:43 +0000 (10:12 -0700)]
staging: comedi: cb_pcidas: use comedi_fc helpers to validate timer args

Use the comedi_fc helper cfc_check_trigger_arg_is() to validate the
trigger arguments when the source is TRIG_TIMER.

All the arguments are unsigned int, change the local variable to an
unsigned int and rename it for aesthetic reasons.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: adl_pci9118: use comedi_fc helpers to validate timer args
H Hartley Sweeten [Tue, 27 May 2014 17:12:42 +0000 (10:12 -0700)]
staging: comedi: adl_pci9118: use comedi_fc helpers to validate timer args

Use the comedi_fc helper, cfc_check_trigger_arg_is(), to validate the
arguments for the TRIG_TIMER command sources. Pass the local variable to
i8253_cascade_ns_to_timer() instead of the cmd argument. This value
is modified by that function to return the actual time (in nanoseconds)
that the timer will be programmed with based on the calculated divisors.
The cfc_check_trigger_arg_is() helper will then validate that the argument
is that value and modify it if not.

Use cfc_check_trigger_arg_min() to do validate the cmd->scan_begin_arg
when the scan_begin_src is TRIG_TIMER and the convert_src is TRIG_NOW.

All the arguments are unsigned int, change the local variable to an
unsigned int and rename it for aesthetic reasons.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: dt3000: use comedi_fc helpers to validate timer args
H Hartley Sweeten [Tue, 27 May 2014 17:12:41 +0000 (10:12 -0700)]
staging: comedi: dt3000: use comedi_fc helpers to validate timer args

Use the comedi_fc helper, cfc_check_trigger_arg_is(), to validate the
cmd->scan_begin_arg for the scan_begin_src TRIG_TIMER. Pass the local
variable to dt2k_ns_to_timer() instead of the cmd argument. This value
is modified by that function to return the actual time (in nanoseconds)
that the timer will be programmed with based on the calculated divisor.
The cfc_check_trigger_arg_is() helper will then validate that the
cmd->cscan_begin_arg is that value and modify it if not.

Also use cfc_check_trigger_arg_is() to validate the cmd->convert_arg
using the same logic.

Use cfc_check_trigger_arg_min() to do validate the cmd->scan_begin_arg
when the convert_src and scan_begin_src are both TRIG_TIMER.

All the arguments are unsigned int, change the local variable to an
unsigned int and rename it for aesthetic reasons.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: adv_pci1710: use comedi_fc helpers to validate timer args
H Hartley Sweeten [Tue, 27 May 2014 17:12:40 +0000 (10:12 -0700)]
staging: comedi: adv_pci1710: use comedi_fc helpers to validate timer args

Use the comedi_fc helper, cfc_check_trigger_arg_is(), to validate the
cmd->convert_arg for the convert_src TRIG_TIMER. Pass the local variable
to i8253_cascade_ns_to_timer() instead of the cmd argument. This value
is modified by that function to return the actual time (in nanoseconds)
that the timer will be programmed with based on the calculated divisors.
The cfc_check_trigger_arg_is() helper will then validate that the
cmd->convert_arg is that value and modify it if not.

The minimum validation is not needed. That was already handled in Step 3.

All the arguments are unsigned int, change the local variable to an
unsigned int and rename it for aesthetic reasons..

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: adl_pci9111: use comedi_fc helpers to validate timer args
H Hartley Sweeten [Tue, 27 May 2014 17:12:39 +0000 (10:12 -0700)]
staging: comedi: adl_pci9111: use comedi_fc helpers to validate timer args

Use the comedi_fc helper, cfc_check_trigger_arg_is(), to validate
the cmd->convert_arg for the convert_src TRIG_TIMER. Pass the local
variable to i8253_cascade_ns_to_timer() instead of the cmd argument.
This value is modified by that function to return the actual time
(in nanoseconds) that the timer will be programmed with based on the
calculated divisors. The cfc_check_trigger_arg_is() helper will then
validate that the cmd->convert_arg is that value and modify it if not.

Also use cfc_check_trigger_arg_is() to validate that the
cmd->scan_begin_arg is the calculate value and modify it if not.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: TODO: remove item "reserve major number"
H Hartley Sweeten [Wed, 28 May 2014 17:22:22 +0000 (10:22 -0700)]
staging: comedi: TODO: remove item "reserve major number"

The major number for comedi has been listed in Documentation/devices.txt
since kernel 2.1.88.

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>
10 years agoStaging: comedi: addi-data: clean up formatting of the else statement
Marcin Kostrzewa [Tue, 27 May 2014 14:38:58 +0000 (14:38 +0000)]
Staging: comedi: addi-data: clean up formatting of the else statement

Signed-off-by: Marcin Kostrzewa <marckostrzewa@gmail.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoRevert "staging: rtl8192u: rename CONFIG_IEEE80211_CRYPT_TKIP"
Greg Kroah-Hartman [Wed, 28 May 2014 21:15:37 +0000 (14:15 -0700)]
Revert "staging: rtl8192u: rename CONFIG_IEEE80211_CRYPT_TKIP"

This reverts commit f8cc81f845456c126fd0ab4d8379a8c47f5ca743.

It breaks the build in linux-next.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6655: refactor iwctl_giwaplist() to avoid -Wframe-larger-than warn.
Konrad Zapalowicz [Tue, 27 May 2014 15:42:25 +0000 (17:42 +0200)]
staging: vt6655: refactor iwctl_giwaplist() to avoid -Wframe-larger-than warn.

This commit refactors the iwctl_giwaplist() function so that the sparse
warning "the frame size of 1292 bytes is larger than 1024 bytes
[-Wframe-larger-than=]" is no more.

The root cause of this warning were two arrays allocated on the stack
and this commit changes this - these arrays are now kmalloc'ed. As a
result the function is refactored and hopefully stil working the same.

I were not able to test these changes so at least the carefull review
is more than welcomed.

Note that my changes has broadened the set of error codes that this
function can return. The new error code is ENOMEM. Luckily, this is
no issue.

Signed-off-by: Konrad Zapalowicz <bergo.torino@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: rf.c replace DBG_PRT debug messages
Malcolm Priestley [Tue, 27 May 2014 20:05:26 +0000 (21:05 +0100)]
staging: vt6656: rf.c replace DBG_PRT debug messages

replace with dev_dbg

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: rf.c Fix typo error at3226*
Malcolm Priestley [Tue, 27 May 2014 20:05:25 +0000 (21:05 +0100)]
staging: vt6656: rf.c Fix typo error at3226*

In commit 78a650dc19ba44e2e07768c6d3b2ff080cf9d245
there was a typo error

abyVT3226_InitTable -> at3226_init_table
abyVT3226D0_InitTable -> at3226d0_init_table

Shoud be vt3226_init_table and vt3226d0_init_table

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: rf.c rename RFbRFTableDownload to vnt_rf_table_download.
Malcolm Priestley [Tue, 27 May 2014 20:05:24 +0000 (21:05 +0100)]
staging: vt6656: rf.c rename RFbRFTableDownload to vnt_rf_table_download.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: rf.c/h rename RFvRSSITodBm to vnt_rf_rssi_to_dbm
Malcolm Priestley [Tue, 27 May 2014 20:05:23 +0000 (21:05 +0100)]
staging: vt6656: rf.c/h rename RFvRSSITodBm to vnt_rf_rssi_to_dbm

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: rf.c/h rename RFbRawSetPower to vnt_rf_set_txpower
Malcolm Priestley [Tue, 27 May 2014 20:05:22 +0000 (21:05 +0100)]
staging: vt6656: rf.c/h rename RFbRawSetPower to vnt_rf_set_txpower

Remove raw and use txpower.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: rf.c/h rename RFbSetPower to vnt_rf_setpower
Malcolm Priestley [Tue, 27 May 2014 20:05:21 +0000 (21:05 +0100)]
staging: vt6656: rf.c/h rename RFbSetPower to vnt_rf_setpower

Removing camel case

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: rf.c: rename IFRFbWriteEmbedded to vnt_rf_write_embedded
Malcolm Priestley [Tue, 27 May 2014 20:05:20 +0000 (21:05 +0100)]
staging: vt6656: rf.c: rename IFRFbWriteEmbedded to vnt_rf_write_embedded

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: IFRFbWriteEmbedded remove camel case
Malcolm Priestley [Tue, 27 May 2014 20:05:19 +0000 (21:05 +0100)]
staging: vt6656: IFRFbWriteEmbedded remove camel case

Camel case changes
pDevice -> priv
dwData -> data
pbyData -> reg_data

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: IFRFbWriteEmbedded use ARRAY_SIZE
Malcolm Priestley [Tue, 27 May 2014 20:05:18 +0000 (21:05 +0100)]
staging: vt6656: IFRFbWriteEmbedded use ARRAY_SIZE

Replace magic number with ARRAY_SIZE of pbyData

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: WCTLbIsDuplicate fix PSCacheEntry base types and warnings
Malcolm Priestley [Tue, 27 May 2014 20:05:17 +0000 (21:05 +0100)]
staging: vt6656: WCTLbIsDuplicate fix PSCacheEntry base types and warnings

Fix wFmSequence and wFrameCtl to __le16

Don't restrict to u8, if packet is a duplicate both bytes of __le16 will be
the same.

Fixes warnings
wctl.c:66:9: warning: restricted __le16 degrades to integer
wctl.c:71:56: warning: restricted __le16 degrades to integer
wctl.c:73:49: warning: cast from restricted __le16
wctl.c:83:30: warning: incorrect type in assignment (different base types)
wctl.c:83:30:    expected unsigned short [unsigned] [usertype] wFmSequence
wctl.c:83:30:    got restricted __le16 [usertype] seq_ctrl
wctl.c:85:28: warning: incorrect type in assignment (different base types)
wctl.c:85:28:    expected unsigned short [unsigned] [usertype] wFrameCtl
wctl.c:85:28:    got restricted __le16 [usertype] frame_control

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: speakup: don't die if accessing sysfs without synth
Sasha Levin [Tue, 27 May 2014 23:08:36 +0000 (19:08 -0400)]
Staging: speakup: don't die if accessing sysfs without synth

Setting a 'silent' parameter without a synth would crash the kernel.

Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8192u: r8180_93cx6.c Added missing spaces
Chaitanya Hazarey [Tue, 27 May 2014 22:35:09 +0000 (15:35 -0700)]
Staging: rtl8192u: r8180_93cx6.c Added missing spaces

Added spaces needed in the proper places to address:

ERROR: space required after that ',' (ctx:VxV)
ERROR: space required after that ';' (ctx:VxV)
ERROR: space required after that close brace '}'
ERROR: space required before the open brace '{'
ERROR: space required before the open parenthesis '('
ERROR: spaces required around that '<' (ctx:VxV)
ERROR: spaces required around that '=' (ctx:VxV)
ERROR: spaces required around that '==' (ctx:VxV)

Signed-off-by: Chaitanya Hazarey <c@24.io>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8188eu:Remove unused macros defined in osdep_service.h
navin patidar [Tue, 27 May 2014 15:35:55 +0000 (21:05 +0530)]
staging: rtl8188eu:Remove unused macros defined in osdep_service.h

Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8188eu:Remove unused inline function res_to_status()
navin patidar [Tue, 27 May 2014 15:35:54 +0000 (21:05 +0530)]
staging: rtl8188eu:Remove unused inline function res_to_status()

Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8188eu:Remove inline function rtw_netif_stop_queue()
navin patidar [Tue, 27 May 2014 15:35:53 +0000 (21:05 +0530)]
staging: rtl8188eu:Remove inline function rtw_netif_stop_queue()

Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8188eu:Remove inline function rtw_netif_start_queue()
navin patidar [Tue, 27 May 2014 15:35:52 +0000 (21:05 +0530)]
staging: rtl8188eu:Remove inline function rtw_netif_start_queue()

Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8188eu:Remove inline function rtw_netif_wake_queue()
navin patidar [Tue, 27 May 2014 15:35:51 +0000 (21:05 +0530)]
staging: rtl8188eu:Remove inline function rtw_netif_wake_queue()

Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8188eu:Remove unused variable struct adapter *pbuddy_padapter
navin patidar [Tue, 27 May 2014 15:35:50 +0000 (21:05 +0530)]
staging: rtl8188eu:Remove unused variable struct adapter *pbuddy_padapter

Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8188eu:Remove unused function rtw_handle_dualmac()
navin patidar [Tue, 27 May 2014 15:35:49 +0000 (21:05 +0530)]
staging: rtl8188eu:Remove unused function rtw_handle_dualmac()

Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8188eu:Drop rtw_handle_dualmac() function calls in rtw_usb_if1_deinit()
navin patidar [Tue, 27 May 2014 15:35:48 +0000 (21:05 +0530)]
staging: rtl8188eu:Drop rtw_handle_dualmac() function calls in rtw_usb_if1_deinit()

rtw_usb_if1_init() assign NULL to pbuddy_padapter variable which is not
being used.

Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8188eu:Drop rtw_handle_dualmac() function calls in rtw_usb_if1_init()
navin patidar [Tue, 27 May 2014 15:35:47 +0000 (21:05 +0530)]
staging: rtl8188eu:Drop rtw_handle_dualmac() function calls in rtw_usb_if1_init()

rtw_usb_if1_init() initializes pbuddy_padapter variable which is not
being used.

Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8188eu:Remove unused function rtl8188eu_set_hw_type()
navin patidar [Tue, 27 May 2014 15:35:46 +0000 (21:05 +0530)]
staging: rtl8188eu:Remove unused function rtl8188eu_set_hw_type()

Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8188eu:Remove unused function chip_by_usb_id()
navin patidar [Tue, 27 May 2014 15:35:45 +0000 (21:05 +0530)]
staging: rtl8188eu:Remove unused function chip_by_usb_id()

Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8188eu:Assign RTL8188E to padapter->chip_type directly
navin patidar [Tue, 27 May 2014 15:35:44 +0000 (21:05 +0530)]
staging: rtl8188eu:Assign RTL8188E to padapter->chip_type directly

Assign RTL8188E to padapter->chip_type directly instead of calling
chip_by_usb_id() function to do same.

Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging:rtl8188eu:Remove code specific to kernel version < 2.6.35
navin patidar [Tue, 27 May 2014 15:35:42 +0000 (21:05 +0530)]
staging:rtl8188eu:Remove code specific to kernel version < 2.6.35

Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8188eu:Remove function rtw_set_tx_chksum_offload()
navin patidar [Tue, 27 May 2014 15:35:41 +0000 (21:05 +0530)]
staging: rtl8188eu:Remove function rtw_set_tx_chksum_offload()

rtw_set_tx_chksum_offload() has empty defination.

Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8821ae: stats.c: Remove version specific code
Sachin Kamat [Tue, 27 May 2014 10:32:48 +0000 (16:02 +0530)]
staging: rtl8821ae: stats.c: Remove version specific code

The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8821ae: trx.h: Remove version specific code
Sachin Kamat [Tue, 27 May 2014 10:32:47 +0000 (16:02 +0530)]
staging: rtl8821ae: trx.h: Remove version specific code

The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8821ae: trx.c: Remove version specific code
Sachin Kamat [Tue, 27 May 2014 10:32:46 +0000 (16:02 +0530)]
staging: rtl8821ae: trx.c: Remove version specific code

The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8821ae: sw.c: Remove version specific code
Sachin Kamat [Tue, 27 May 2014 10:32:45 +0000 (16:02 +0530)]
staging: rtl8821ae: sw.c: Remove version specific code

The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8821ae: regd.h: Remove version specific code
Sachin Kamat [Tue, 27 May 2014 10:32:44 +0000 (16:02 +0530)]
staging: rtl8821ae: regd.h: Remove version specific code

The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8821ae: regd.c: Remove version specific code
Sachin Kamat [Tue, 27 May 2014 10:32:43 +0000 (16:02 +0530)]
staging: rtl8821ae: regd.c: Remove version specific code

The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8821ae: rc.c: Remove version specific code
Sachin Kamat [Tue, 27 May 2014 10:32:42 +0000 (16:02 +0530)]
staging: rtl8821ae: rc.c: Remove version specific code

The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8821ae: ps.c: Remove version specific code
Sachin Kamat [Tue, 27 May 2014 10:32:41 +0000 (16:02 +0530)]
staging: rtl8821ae: ps.c: Remove version specific code

The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8821ae: pci.h: Remove version specific code
Sachin Kamat [Tue, 27 May 2014 10:32:40 +0000 (16:02 +0530)]
staging: rtl8821ae: pci.h: Remove version specific code

The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8821ae: pci.c: Remove version specific code
Sachin Kamat [Tue, 27 May 2014 10:32:39 +0000 (16:02 +0530)]
staging: rtl8821ae: pci.c: Remove version specific code

The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8821ae: efuse.c: Remove version specific code
Sachin Kamat [Tue, 27 May 2014 10:32:38 +0000 (16:02 +0530)]
staging: rtl8821ae: efuse.c: Remove version specific code

The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8821ae: debug.c: Remove version specific code
Sachin Kamat [Tue, 27 May 2014 10:32:37 +0000 (16:02 +0530)]
staging: rtl8821ae: debug.c: Remove version specific code

The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8821ae: core.c: Remove version specific code
Sachin Kamat [Tue, 27 May 2014 10:32:36 +0000 (16:02 +0530)]
staging: rtl8821ae: core.c: Remove version specific code

The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8821ae: compat.h: Remove version specific code
Sachin Kamat [Tue, 27 May 2014 10:32:35 +0000 (16:02 +0530)]
staging: rtl8821ae: compat.h: Remove version specific code

The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8821ae: cam.c: Remove version specific code
Sachin Kamat [Tue, 27 May 2014 10:32:34 +0000 (16:02 +0530)]
staging: rtl8821ae: cam.c: Remove version specific code

The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8821ae: base.c: Remove version specific code
Sachin Kamat [Tue, 27 May 2014 10:32:33 +0000 (16:02 +0530)]
staging: rtl8821ae: base.c: Remove version specific code

The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: remove in_request_module
Ian Abbott [Tue, 27 May 2014 14:06:17 +0000 (15:06 +0100)]
staging: comedi: remove in_request_module

The `in_request_module` member of `struct comedi_device` is only ever
set to `false`, so remove the code that checks for it being `true` and
remove the member.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove unneeded version.h inclusion in ioctl_cfg80211.c
Sachin Kamat [Tue, 27 May 2014 09:58:09 +0000 (15:28 +0530)]
staging: rtl8723au: Remove unneeded version.h inclusion in ioctl_cfg80211.c

version.h inclusion is not needed as detected by versioncheck.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove unneeded version.h inclusion in os_intfs.c
Sachin Kamat [Tue, 27 May 2014 09:58:10 +0000 (15:28 +0530)]
staging: rtl8723au: Remove unneeded version.h inclusion in os_intfs.c

version.h inclusion is not needed as detected by versioncheck.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove unneeded version.h inclusion in osdep_service.h
Sachin Kamat [Tue, 27 May 2014 09:58:08 +0000 (15:28 +0530)]
staging: rtl8723au: Remove unneeded version.h inclusion in osdep_service.h

version.h inclusion is not needed as detected by versioncheck.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8192ee: Remove unneeded version.h inclusion
Sachin Kamat [Tue, 27 May 2014 09:55:48 +0000 (15:25 +0530)]
staging: rtl8192ee: Remove unneeded version.h inclusion

version.h inclusion is not needed as detected by versioncheck.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8192ee: Fix build error
Sachin Kamat [Tue, 27 May 2014 09:55:47 +0000 (15:25 +0530)]
staging: rtl8192ee: Fix build error

Fixes the followign build error:
drivers/staging/rtl8192ee/btcoexist/halbtc8723b1ant.c:1387:6: error: called object is not a function or function pointer
      ("[BTCoex], Wifi non connected-idle + BT Busy!!\n"));

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8712: return -ENOMEM instead of -1
Vitaly Osipov [Tue, 27 May 2014 12:27:37 +0000 (22:27 +1000)]
staging: rtl8712: return -ENOMEM instead of -1

After the commit 91d435f replaced _malloc with kmalloc, smatch picked up a
couple of new warnings. This fixes the warning:

warn: returning -1 instead of -ENOMEM is sloppy

Signed-off-by: Vitaly Osipov <vitaly.osipov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8712: fix kmalloc parameters
Vitaly Osipov [Tue, 27 May 2014 12:26:12 +0000 (22:26 +1000)]
staging: rtl8712: fix kmalloc parameters

After the commit 91d435f replaced _malloc with kmalloc, smatch picked up a
couple of new warnings. This fixes warnings:

warn: struct type mismatch 'writePTM_parm vs setdig_parm'
warn: struct type mismatch 'writePTM_parm vs setra_parm'

The difference is u8 vs unsigned char.

Signed-off-by: Vitaly Osipov <vitaly.osipov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: remove check for CONFIG_KMOD
Paul Bolle [Mon, 26 May 2014 19:09:10 +0000 (21:09 +0200)]
staging: comedi: remove check for CONFIG_KMOD

The comedi driver was added in v2.6.29. That's the same release that
removed the Kconfig symbol KMOD. So the code behind a test for its
macro has been hidden since it was in staging. Remove it.

Remove a useless assignment to "dev->in_request_module" too. That
variable seems pointless anyhow, but that's a different issue.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ctx1e1: remove checks for three macros
Paul Bolle [Mon, 26 May 2014 19:18:01 +0000 (21:18 +0200)]
staging: ctx1e1: remove checks for three macros

When the ctx1e1 driver was added in v2.6.35 it contained checks for
CONFIG_SBE_HDLC_V7, CONFIG_SBE_WAN256T3_HDLC_V7, and
CONFIG_SBE_WAN256T3_NCOMM (and MODULE variants). The related Kconfig
symbols didn't exist then. They still don't exist now. Remove these
checks.

Do some related cleaning up and remove the unused V7() macro too.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: lirc: remove checks for CONFIG_LIRC_SERIAL_NSLU2
Paul Bolle [Mon, 26 May 2014 19:26:57 +0000 (21:26 +0200)]
staging: lirc: remove checks for CONFIG_LIRC_SERIAL_NSLU2

When support for homebrew serial port receivers was added in v2.6.36 its
code contained checks for CONFIG_LIRC_SERIAL_NSLU2. The related Kconfig
symbol didn't exist then. It still doesn't exist now. Remove these checks.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8192u: remove checks for CONFIG_RTL8192_PM
Paul Bolle [Mon, 26 May 2014 19:40:46 +0000 (21:40 +0200)]
staging: rtl8192u: remove checks for CONFIG_RTL8192_PM

When the rtl8192u driver was added in v2.6.33 its code contained checks
for CONFIG_RTL8192_PM. The related Kconfig symbol didn't exist then. It
still doesn't exist now. Remove these checks.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: tidspbridge: check for CONFIG_SND_OMAP_SOC_MCBSP
Paul Bolle [Mon, 26 May 2014 19:47:11 +0000 (21:47 +0200)]
staging: tidspbridge: check for CONFIG_SND_OMAP_SOC_MCBSP

Commit d0f47ff17f29 ("ASoC: OMAP: Build config cleanup for McBSP")
removed the Kconfig symbol OMAP_MCBSP. It left two checks for
CONFIG_OMAP_MCBSP untouched.

Convert these to checks for CONFIG_SND_OMAP_SOC_MCBSP. That must be
correct, since that re-enables calls to functions that are all found in
sound/soc/omap/mcbsp.c. And that file is built only if
CONFIG_SND_OMAP_SOC_MCBSP is defined.

Fixes: d0f47ff17f29 ("ASoC: OMAP: Build config cleanup for McBSP")
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8192u: rename CONFIG_IEEE80211_CRYPT_TKIP
Paul Bolle [Mon, 26 May 2014 20:19:51 +0000 (22:19 +0200)]
staging: rtl8192u: rename CONFIG_IEEE80211_CRYPT_TKIP

The Kconfig symbol IEEE80211_CRYPT_TKIP was renamed to
LIB80211_CRYPT_TKIP in commit 274bfb8dc5ff ("lib80211: absorb crypto
bits from net/ieee80211"). So when rtl8192u was added as a staging
driver in v2.6.33 its checks for CONFIG_IEEE80211_CRYPT_TKIP were
already outdated. Use CONFIG_LIB80211_CRYPT_TKIP instead, as was clearly
intended.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>