linux-2.6-microblaze.git
10 years agoRevert "staging: dgap: remove unneeded kfree() in dgap_tty_register_ports()"
Greg Kroah-Hartman [Thu, 29 May 2014 20:59:03 +0000 (13:59 -0700)]
Revert "staging: dgap: remove unneeded kfree() in dgap_tty_register_ports()"

This reverts commit 0ade4a34fd439d62df46937e8f3e584eb0879579 as it was
wrong.

Cc: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8192u: r8192U_wx.c Fixed a misplaced brace
Chaitanya Hazarey [Wed, 28 May 2014 23:23:47 +0000 (16:23 -0700)]
Staging: rtl8192u: r8192U_wx.c Fixed a misplaced brace

Fixed a misplaced brace in a function

Signed-off-by: Chaitanya Hazarey <c@24.io>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ion: shrink highmem pages on kswapd
Heesub Shin [Wed, 28 May 2014 06:52:59 +0000 (15:52 +0900)]
staging: ion: shrink highmem pages on kswapd

ION system heap keeps pages in its pool for better performance. When the
system is under memory pressure, slab shrinker calls the callback
registered and then the pages pooled get freed.

When the shrinker is called, it checks gfp_mask and determines whether
the pages from highmem need to be freed or the pages from lowmem.
Usually, slab shrinker is invoked on kswapd context which gfp_mask is
always GFP_KERNEL, so only lowmem pages are released on kswapd context.
This means that highmem pages in the pool are never reclaimed until
direct reclaim occurs. This can be problematic when the page pool holds
excessive amounts of highmem.

For now, the shrinker callback cannot know exactly which zone should be
targeted for reclamation, as enough information are not passed to. Thus,
it makes sense to shrink both lowmem and highmem zone on kswapd context.

Reported-by: Wonseo Choi <wonseo.choi@samsung.com>
Signed-off-by: Heesub Shin <heesub.shin@samsung.com>
Reviewed-by: Mitchel Humpherys <mitchelh@codeaurora.org>
Tested-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ion: use compound pages on high order pages for system heap
Heesub Shin [Wed, 28 May 2014 06:52:55 +0000 (15:52 +0900)]
staging: ion: use compound pages on high order pages for system heap

Using compound pages relieves burden on tracking the meta information
which are currently stored in page_info.

Signed-off-by: Heesub Shin <heesub.shin@samsung.com>
Reviewed-by: Mitchel Humpherys <mitchelh@codeaurora.org>
Tested-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ion: remove struct ion_page_pool_item
Heesub Shin [Wed, 28 May 2014 06:52:54 +0000 (15:52 +0900)]
staging: ion: remove struct ion_page_pool_item

The page pool uses an internal data structure, ion_page_pool_item, for
wrapping pooled pages and constructing a list. As the struct page
already provides ways for doing exactly the same thing, we do not need
to reinvent the wheel. This commit removes the data structure and slab
allocations for it.

Signed-off-by: Heesub Shin <heesub.shin@samsung.com>
Reviewed-by: Mitchel Humpherys <mitchelh@codeaurora.org>
Tested-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ion: simplify ion_page_pool_total()
Heesub Shin [Wed, 28 May 2014 06:52:53 +0000 (15:52 +0900)]
staging: ion: simplify ion_page_pool_total()

ion_page_pool_total() returns the total number of pages in the pool.
Depending on the argument passed, it counts highmem pages in or not.
This commit simplifies the code lines for better readability.

Signed-off-by: Heesub Shin <heesub.shin@samsung.com>
Reviewed-by: Mitchel Humpherys <mitchelh@codeaurora.org>
Tested-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ion: tidy up a bit
Heesub Shin [Wed, 28 May 2014 06:52:52 +0000 (15:52 +0900)]
staging: ion: tidy up a bit

For aesthetics and readability, rename goto labels, remove
useless code lines, and clarify function return type.

Signed-off-by: Heesub Shin <heesub.shin@samsung.com>
Reviewed-by: Mitchel Humpherys <mitchelh@codeaurora.org>
Tested-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove redundant casting in usb_ops_linux.c
Sachin Kamat [Wed, 28 May 2014 12:06:30 +0000 (17:36 +0530)]
staging: rtl8723au: Remove redundant casting in usb_ops_linux.c

Casting value returned by k[cmz]alloc is useless.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove redundant casting in rtl8723a_hal_init.c
Sachin Kamat [Wed, 28 May 2014 12:06:29 +0000 (17:36 +0530)]
staging: rtl8723au: Remove redundant casting in rtl8723a_hal_init.c

Casting value returned by k[cmz]alloc is useless.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove redundant casting in rtw_xmit.c
Sachin Kamat [Wed, 28 May 2014 12:06:28 +0000 (17:36 +0530)]
staging: rtl8723au: Remove redundant casting in rtw_xmit.c

Casting value returned by k[cmz]alloc is useless.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove redundant casting in rtw_wlan_util.c
Sachin Kamat [Wed, 28 May 2014 12:06:27 +0000 (17:36 +0530)]
staging: rtl8723au: Remove redundant casting in rtw_wlan_util.c

Casting value returned by k[cmz]alloc is useless.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove redundant casting in rtw_sta_mgt.c
Sachin Kamat [Wed, 28 May 2014 12:06:26 +0000 (17:36 +0530)]
staging: rtl8723au: Remove redundant casting in rtw_sta_mgt.c

Casting value returned by k[cmz]alloc is useless.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove redundant casting in rtw_recv.c
Sachin Kamat [Wed, 28 May 2014 12:06:25 +0000 (17:36 +0530)]
staging: rtl8723au: Remove redundant casting in rtw_recv.c

Casting value returned by k[cmz]alloc is useless.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove redundant casting in rtw_mlme.c
Sachin Kamat [Wed, 28 May 2014 12:06:24 +0000 (17:36 +0530)]
staging: rtl8723au: Remove redundant casting in rtw_mlme.c

Casting value returned by k[cmz]alloc is useless.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: dgap: Use EIO instead of ENXIO
Mark Hounschell [Wed, 28 May 2014 20:18:03 +0000 (16:18 -0400)]
staging: dgap: Use EIO instead of ENXIO

Replaces ENXIO with EIO errno

Signed-off-by: Mark Hounschell <markh@compro.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: dgap: Simplify dgap_find_config
Mark Hounschell [Wed, 28 May 2014 20:17:55 +0000 (16:17 -0400)]
staging: dgap: Simplify dgap_find_config

Simplify ugly dgap_find_config function

Signed-off-by: Mark Hounschell <markh@compro.net>
Tested-by: Mark Hounschell <markh@compro.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: dgap: misc cleanup of NULL conditionals
Mark Hounschell [Wed, 28 May 2014 20:17:45 +0000 (16:17 -0400)]
staging: dgap: misc cleanup of NULL conditionals

refactors NULL conditionals

Signed-off-by: Mark Hounschell <markh@compro.net>
Tested-by: Mark Hounschell <markh@compro.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8192u: r8192U_wx.c Added {} braces and newlines
Chaitanya Hazarey [Wed, 28 May 2014 14:32:39 +0000 (07:32 -0700)]
Staging: rtl8192u: r8192U_wx.c Added {} braces and newlines

Added {} braces and newlines to address the following:

ERROR: else should follow close brace '}'
ERROR: space required before the open brace '{'
ERROR: trailing statements should be on next line
ERROR: space required before the open parenthesis '('
ERROR: that open brace { should be on the previous line

Signed-off-by: Chaitanya Hazarey <c@24.io>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8192u: r8192U_wx.c Added missing spaces
Chaitanya Hazarey [Wed, 28 May 2014 14:32:38 +0000 (07:32 -0700)]
Staging: rtl8192u: r8192U_wx.c Added missing spaces

Added spaces needed in the proper places to address:

WARNING: please, no spaces at the start of a line
WARNING: missing space after struct definition
ERROR: spaces required around that '!=' (ctx:WxV)
ERROR: spaces required around that '=' (ctx:WxV)
ERROR: spaces required around that '=' (ctx:VxW)
ERROR: spaces required around that '&&' (ctx:VxV)
ERROR: spaces required around that '!=' (ctx:VxV)
ERROR: spaces required around that '=' (ctx:VxV)
ERROR: spaces required around that '==' (ctx:VxV)
ERROR: spaces required around that '<' (ctx:VxV)
ERROR: space required before the open parenthesis '('
ERROR: space required before the open brace '{'
ERROR: space required after that ',' (ctx:VxV)
ERROR: space required after that close brace '}'
ERROR: space prohibited before that '--' (ctx:WxO)
ERROR: space prohibited before that close parenthesis ')'
ERROR: space prohibited after that open parenthesis '('

Signed-off-by: Chaitanya Hazarey <c@24.io>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agortl8192ee: btcoexist: remove undefined Kconfig macros
Paul Bolle [Mon, 26 May 2014 14:45:47 +0000 (16:45 +0200)]
rtl8192ee: btcoexist: remove undefined Kconfig macros

There are references to four undefined Kconfig macros in the code.
Commit 8542373dccd2 ("Staging: rtl8812ae: remove undefined Kconfig
macros") removed identical references from another staging driver, but
they resurfaced in rtl8192ee. Remove these again as the checks for them
still will always evaluate to false.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging/frontier/tranzport: coding style fixes
Robin Schroer [Wed, 28 May 2014 12:52:45 +0000 (14:52 +0200)]
Staging/frontier/tranzport: coding style fixes

added newlines after declarations in two places

Signed-off-by: Robin Schroer <sulamiification@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove duplicate inclusion of wlan_bssdef.h
Sachin Kamat [Wed, 28 May 2014 11:39:01 +0000 (17:09 +0530)]
staging: rtl8723au: Remove duplicate inclusion of wlan_bssdef.h

wlan_bssdef.h was included twice.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8188eu: Remove unneeded version.h inclusion
Sachin Kamat [Wed, 28 May 2014 11:28:18 +0000 (16:58 +0530)]
staging: rtl8188eu: 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: comedi: adl_pci9111: factor fifo handling out of pci9111_interrupt()
H Hartley Sweeten [Tue, 27 May 2014 17:31:14 +0000 (10:31 -0700)]
staging: comedi: adl_pci9111: factor fifo handling out of pci9111_interrupt()

Factor the fifo half-full handling out of the interrupt function to reduce
the indent level of the code.

Tidy up the factored out code.

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 unreachable code in usbduxfast_ai_cmd()
H Hartley Sweeten [Tue, 27 May 2014 17:31:13 +0000 (10:31 -0700)]
staging: comedi: usbduxfast: remove unreachable code in usbduxfast_ai_cmd()

The (*do_cmdtest) validates that the 'stop_arg' is >= 1 for a 'stop_src'
of TRIG_COUNT and the 'scan_end_arg' is validated to be the 'chanlist_len'
which will always be >= 1. Remove the unreachable error code for an
'ai_sample_count < 1'.

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 cfc_bytes_per_scan()
H Hartley Sweeten [Tue, 27 May 2014 17:31:12 +0000 (10:31 -0700)]
staging: comedi: pcl818: use cfc_bytes_per_scan()

Use the comedi_fc helper to get the number of bytes per scan.

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 cfc_bytes_per_scan()
H Hartley Sweeten [Tue, 27 May 2014 17:31:11 +0000 (10:31 -0700)]
staging: comedi: pcl816: use cfc_bytes_per_scan()

Use the comedi_fc helper to get the number of bytes per scan.

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 cfc_bytes_per_scan()
H Hartley Sweeten [Tue, 27 May 2014 17:31:10 +0000 (10:31 -0700)]
staging: comedi: pcl812: use cfc_bytes_per_scan()

Use the comedi_fc helper to get the number of bytes per scan.

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 cfc_bytes_per_scan()
H Hartley Sweeten [Tue, 27 May 2014 17:31:09 +0000 (10:31 -0700)]
staging: comedi: das16: use cfc_bytes_per_scan()

Use the comedi_fc helper to get the number of bytes per scan.

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 cfc_bytes_per_scan()
H Hartley Sweeten [Tue, 27 May 2014 17:31:07 +0000 (10:31 -0700)]
staging: comedi: amplc_pci230: use cfc_bytes_per_scan()

Use the comedi_fc helper function to get the 'bytes_per_scan'.

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 cfc_bytes_per_scan()
H Hartley Sweeten [Tue, 27 May 2014 17:31:06 +0000 (10:31 -0700)]
staging: comedi: amplc_pci224: use cfc_bytes_per_scan()

The cmd->chanlist_len will always be >= 1 in this function. Remove the
unnecessary checks.

Use the comedi_fc helper function to get the 'bytes_per_scan'.

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_fc: use comedi_cmd pointer
H Hartley Sweeten [Tue, 27 May 2014 17:31:05 +0000 (10:31 -0700)]
staging: comedi: comedi_fc: use comedi_cmd pointer

Use a local variable to access the comedi_cmd as a pointer instead
of getting to 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_pcidas64: change params to external_ai_queue_in_use()
H Hartley Sweeten [Tue, 27 May 2014 17:31:04 +0000 (10:31 -0700)]
staging: comedi: cb_pcidas64: change params to external_ai_queue_in_use()

The caller already has the comedi_subdevice and comedi_cmd pointers. Pass
those variables to the helper 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: cb_pcidas64: use comedi_cmd pointer
H Hartley Sweeten [Tue, 27 May 2014 17:31:03 +0000 (10:31 -0700)]
staging: comedi: cb_pcidas64: use comedi_cmd pointer

Use a local variable to access the comedi_cmd as a pointer instead
of getting to 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: ni_labpc: use comedi_cmd pointer
H Hartley Sweeten [Tue, 27 May 2014 17:31:02 +0000 (10:31 -0700)]
staging: comedi: ni_labpc: use comedi_cmd pointer

Use a local variable to access the comedi_cmd as a pointer instead
of getting to 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: ni_labpc_isadma: use comedi_cmd pointer
H Hartley Sweeten [Tue, 27 May 2014 17:31:01 +0000 (10:31 -0700)]
staging: comedi: ni_labpc_isadma: use comedi_cmd pointer

Use a local variable to access the comedi_cmd as a pointer instead
of getting to 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: ni_mio_common: use comedi_cmd pointer
H Hartley Sweeten [Tue, 27 May 2014 17:31:00 +0000 (10:31 -0700)]
staging: comedi: ni_mio_common: use comedi_cmd pointer

Use a local variable to access the comedi_cmd as a pointer instead
of getting to 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: pcl711: use comedi_cmd pointer
H Hartley Sweeten [Tue, 27 May 2014 17:30:59 +0000 (10:30 -0700)]
staging: comedi: pcl711: use comedi_cmd pointer

Use a local variable to access the comedi_cmd as a pointer instead
of getting to 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: pcl816: fix DMA 'bytes' calculation
H Hartley Sweeten [Tue, 27 May 2014 17:30:58 +0000 (10:30 -0700)]
staging: comedi: pcl816: fix DMA 'bytes' calculation

The calculation for the total number of bytes in the DMA transfer
is incorrect. Fix it.

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: pcmmio: remove 'continuous' from private data
H Hartley Sweeten [Tue, 27 May 2014 17:30:57 +0000 (10:30 -0700)]
staging: comedi: pcmmio: remove 'continuous' from private data

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

Refactor pcmmio_handle_dio_intr() to remove an indent level.

For aesthetics, change the switch in pcmmio_cmd() to an if/else.

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: pcmmio: use comedi_cmd pointer
H Hartley Sweeten [Tue, 27 May 2014 17:30:56 +0000 (10:30 -0700)]
staging: comedi: pcmmio: use comedi_cmd pointer

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

Remove the unnecessary local variables used for 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: pcmuio: tidy up local variables in pcmuio_handle_intr_subdev()
H Hartley Sweeten [Tue, 27 May 2014 17:30:55 +0000 (10:30 -0700)]
staging: comedi: pcmuio: tidy up local variables in pcmuio_handle_intr_subdev()

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

Remove the local variable 'len' and use the cmd->chanlist_len directly.

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: use comedi_cmd pointer
H Hartley Sweeten [Tue, 27 May 2014 17:30:54 +0000 (10:30 -0700)]
staging: comedi: usbduxsigma: 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: 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>