Commit Graph

443984 Commits

Author SHA1 Message Date
H Hartley Sweeten
58245cc968 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>
2014-05-28 14:25:56 -07:00
H Hartley Sweeten
e9ace43cbf 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>
2014-05-28 14:25:56 -07:00
H Hartley Sweeten
0e21721125 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>
2014-05-28 14:25:56 -07:00
H Hartley Sweeten
b2ef4813d0 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>
2014-05-28 14:25:56 -07:00
H Hartley Sweeten
815bb5b5c9 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>
2014-05-28 14:25:56 -07:00
H Hartley Sweeten
9c1efda838 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>
2014-05-28 14:25:56 -07:00
H Hartley Sweeten
1406057d36 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>
2014-05-28 14:25:56 -07:00
H Hartley Sweeten
474cd8a1fe 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>
2014-05-28 14:25:56 -07:00
H Hartley Sweeten
7158fddc16 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>
2014-05-28 14:25:56 -07:00
H Hartley Sweeten
c2803ad110 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>
2014-05-28 14:18:11 -07:00
Marcin Kostrzewa
6015bd5538 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>
2014-05-28 14:18:11 -07:00
Greg Kroah-Hartman
81aa143bae Revert "staging: rtl8192u: rename CONFIG_IEEE80211_CRYPT_TKIP"
This reverts commit f8cc81f845.

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>
2014-05-28 14:15:37 -07:00
Konrad Zapalowicz
0c4df9c969 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>
2014-05-28 14:10:46 -07:00
Malcolm Priestley
5dda2528ef 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>
2014-05-28 14:10:46 -07:00
Malcolm Priestley
c85a81b22d staging: vt6656: rf.c Fix typo error at3226*
In commit 78a650dc19
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>
2014-05-28 14:10:46 -07:00
Malcolm Priestley
c49d7550e5 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>
2014-05-28 14:10:46 -07:00
Malcolm Priestley
21bba58ae1 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>
2014-05-28 14:10:46 -07:00
Malcolm Priestley
8543bb9c21 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>
2014-05-28 14:10:46 -07:00
Malcolm Priestley
4f5290ea3c 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>
2014-05-28 14:10:46 -07:00
Malcolm Priestley
32c48cb8ba 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>
2014-05-28 14:10:46 -07:00
Malcolm Priestley
d6df2bf2bf 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>
2014-05-28 14:10:46 -07:00
Malcolm Priestley
25d279d3b2 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>
2014-05-28 14:10:46 -07:00
Malcolm Priestley
9046db518e 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>
2014-05-28 14:10:45 -07:00
Sasha Levin
8b9c012a42 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>
2014-05-27 17:35:50 -07:00
Chaitanya Hazarey
6371f2105a 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>
2014-05-27 17:35:50 -07:00
navin patidar
47d5636026 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>
2014-05-27 12:03:43 -07:00
navin patidar
8a089b1f34 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>
2014-05-27 12:03:43 -07:00
navin patidar
945c097243 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>
2014-05-27 12:03:42 -07:00
navin patidar
7788697391 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>
2014-05-27 12:03:42 -07:00
navin patidar
457c7b6a4d 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>
2014-05-27 12:03:42 -07:00
navin patidar
a05270ef63 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>
2014-05-27 12:03:42 -07:00
navin patidar
253e0114eb 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>
2014-05-27 12:03:42 -07:00
navin patidar
383ff5492d 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>
2014-05-27 12:03:42 -07:00
navin patidar
0f56c6e978 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>
2014-05-27 12:03:42 -07:00
navin patidar
920f2e1134 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>
2014-05-27 12:03:42 -07:00
navin patidar
4814257cc6 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>
2014-05-27 12:03:41 -07:00
navin patidar
baf3a0112c 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>
2014-05-27 12:03:41 -07:00
navin patidar
c95c51170d 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>
2014-05-27 12:03:41 -07:00
navin patidar
0481bfce17 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>
2014-05-27 12:03:41 -07:00
Sachin Kamat
fe6d68f212 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>
2014-05-27 11:58:27 -07:00
Sachin Kamat
2b4b5a628c 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>
2014-05-27 11:58:27 -07:00
Sachin Kamat
e7f5a21942 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>
2014-05-27 11:58:27 -07:00
Sachin Kamat
575e8dace0 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>
2014-05-27 11:58:27 -07:00
Sachin Kamat
0c288d454d 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>
2014-05-27 11:58:27 -07:00
Sachin Kamat
b9ddcee903 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>
2014-05-27 11:58:26 -07:00
Sachin Kamat
756a748106 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>
2014-05-27 11:58:26 -07:00
Sachin Kamat
35722b4141 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>
2014-05-27 11:58:26 -07:00
Sachin Kamat
aa59f7a526 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>
2014-05-27 11:58:26 -07:00
Sachin Kamat
c6e8a9e8ef 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>
2014-05-27 11:58:26 -07:00
Sachin Kamat
1939f350a2 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>
2014-05-27 11:58:26 -07:00