linux-stable.git/drivers/staging/csr, branch linux-3.9.y Linux kernel stable tree Merge tag 'staging-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 2013-02-21T20:11:44+00:00 Linus Torvalds torvalds@linux-foundation.org 2013-02-21T20:11:44+00:00 b5c78e04dd061b776978dad61dd85357081147b0 Pull staging tree update from Greg Kroah-Hartman: "Here's the big staging tree merge for 3.9-rc1 Lots of cleanups and updates for drivers all through the staging tree. We are pretty much "code neutral" here, adding just about as many lines as we removed. All of these have been in linux-next for a while." * tag 'staging-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (804 commits) staging: comedi: vmk80xx: wait for URBs to complete staging: comedi: drivers: addi-data: hwdrv_apci3200.c: Add a missing semicolon staging: et131x: Update TODO list staging: et131x: Remove assignment of skb->dev staging: wlan-ng: hfa384x.h: fix for error reported by smatch staging/zache checkpatch ERROR: spaces prohibited around that staging/ozwpan: Mark read only parameters and structs as const staging/ozwpan: Remove empty and unused function oz_cdev_heartbeat staging/ozwpan: Mark local functions as static (fix sparse warnings) staging/ozwpan: Add missing header includes staging/usbip: Mark local functions as static (fix sparse warnings) staging/xgifb: Remove duplicated code in loops. staging/xgifb: Consolidate return paths staging/xgifb: Remove code without effect staging/xgifb: Remove unnecessary casts staging/xgifb: Consolidate if/else if with identical code branches staging: vt6656: replaced custom TRUE definition with true staging: vt6656: replaced custom FALSE definition with false staging: vt6656: replace custom BOOL definition with bool staging/rtl8187se: Mark functions as static to silence sparse ... 
Pull staging tree update from Greg Kroah-Hartman:
 "Here's the big staging tree merge for 3.9-rc1

  Lots of cleanups and updates for drivers all through the staging tree.
  We are pretty much "code neutral" here, adding just about as many
  lines as we removed.

  All of these have been in linux-next for a while."

* tag 'staging-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (804 commits)
  staging: comedi: vmk80xx: wait for URBs to complete
  staging: comedi: drivers: addi-data: hwdrv_apci3200.c: Add a missing semicolon
  staging: et131x: Update TODO list
  staging: et131x: Remove assignment of skb->dev
  staging: wlan-ng: hfa384x.h: fix for error reported by smatch
  staging/zache checkpatch ERROR: spaces prohibited around that
  staging/ozwpan: Mark read only parameters and structs as const
  staging/ozwpan: Remove empty and unused function oz_cdev_heartbeat
  staging/ozwpan: Mark local functions as static (fix sparse warnings)
  staging/ozwpan: Add missing header includes
  staging/usbip: Mark local functions as static (fix sparse warnings)
  staging/xgifb: Remove duplicated code in loops.
  staging/xgifb: Consolidate return paths
  staging/xgifb: Remove code without effect
  staging/xgifb: Remove unnecessary casts
  staging/xgifb: Consolidate if/else if with identical code branches
  staging: vt6656: replaced custom TRUE definition with true
  staging: vt6656: replaced custom FALSE definition with false
  staging: vt6656: replace custom BOOL definition with bool
  staging/rtl8187se: Mark functions as static to silence sparse
  ...
sched/rt: Move rt specific bits into new header file 2013-02-07T19:51:08+00:00 Clark Williams williams@redhat.com 2013-02-07T15:47:07+00:00 8bd75c77b7c6a3954140dd2e20346aef3efe4a35 Move rt scheduler definitions out of include/linux/sched.h into new file include/linux/sched/rt.h Signed-off-by: Clark Williams <williams@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Steven Rostedt <rostedt@goodmis.org> Link: http://lkml.kernel.org/r/20130207094707.7b9f825f@riff.lan Signed-off-by: Ingo Molnar <mingo@kernel.org> 
Move rt scheduler definitions out of include/linux/sched.h into
new file include/linux/sched/rt.h

Signed-off-by: Clark Williams <williams@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/20130207094707.7b9f825f@riff.lan
Signed-off-by: Ingo Molnar <mingo@kernel.org>
staging/csr: Use kmemdup rather than duplicating its implementation 2013-01-30T04:22:16+00:00 Peter Huewe peterhuewe@gmx.de 2013-01-25T23:19:19+00:00 2643c47fa4accb49abf46a1486909e20e4bb5df9 Found with coccicheck. The semantic patch that makes this change is available in scripts/coccinelle/api/memdup.cocci. Signed-off-by: Peter Huewe <peterhuewe@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
Found with coccicheck.
The semantic patch that makes this change is available
in scripts/coccinelle/api/memdup.cocci.

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
staging/csr: Fix dereference before check 2013-01-07T22:56:04+00:00 Peter Huewe peterhuewe@gmx.de 2013-01-07T22:09:53+00:00 94b84e4510f5b625d74e410103d49dfce826a41d Smatch complains about some pointers that are dereferenced before being checked: drivers/staging/csr/sme_sys.c:285 CsrWifiRouterCtrlHipReqHandler() warn: variable dereferenced before check 'priv' (see line 283) drivers/staging/csr/sme_sys.c:1503 CsrWifiRouterMaPacketReqHandler() warn: variable dereferenced before check 'priv' (see line 1501) drivers/staging/csr/sme_sys.c:2062 CsrWifiRouterCtrlPeerDelReqHandler() warn: variable dereferenced before check 'priv' (see line 2059) drivers/staging/csr/sme_sys.c:2477 CsrWifiRouterCtrlPeerAddReqHandler() warn: variable dereferenced before check 'priv' (see line 2474) drivers/staging/csr/sme_sys.c:3045 CsrWifiRouterCtrlWapiRxPktReqHandler() warn: variable dereferenced before check 'priv' (see line 3039) We put the check before the dereferencing and prevent an oops and fix the warning. Signed-off-by: Peter Huewe <peterhuewe@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
Smatch complains about some pointers that are dereferenced before being
checked:

drivers/staging/csr/sme_sys.c:285
CsrWifiRouterCtrlHipReqHandler() warn: variable dereferenced before
check 'priv' (see line 283)
drivers/staging/csr/sme_sys.c:1503
CsrWifiRouterMaPacketReqHandler() warn: variable dereferenced before
check 'priv' (see line 1501)
drivers/staging/csr/sme_sys.c:2062
CsrWifiRouterCtrlPeerDelReqHandler() warn: variable dereferenced before
check 'priv' (see line 2059)
drivers/staging/csr/sme_sys.c:2477
CsrWifiRouterCtrlPeerAddReqHandler() warn: variable dereferenced before
check 'priv' (see line 2474)
drivers/staging/csr/sme_sys.c:3045
CsrWifiRouterCtrlWapiRxPktReqHandler() warn: variable dereferenced
before check 'priv' (see line 3039)

We put the check before the dereferencing and prevent an oops and fix
the warning.

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
staging: csr: remove unneeded call to memset(). 2013-01-07T22:03:32+00:00 Cyril Roelandt tipecaml@gmail.com 2012-12-04T20:41:07+00:00 78855c7a7c3db183ddb311cd832a137ef7a5e83a In uf_send_pkt_to_encrypt(), the memory area zeroed by this call to memset() is overwritten by a call to memcpy() a few instructions later, so it is not needed. Signed-off-by: Cyril Roelandt <tipecaml@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
In uf_send_pkt_to_encrypt(), the memory area zeroed by this call to memset() is
overwritten by a call to memcpy() a few instructions later, so it is not needed.

Signed-off-by: Cyril Roelandt <tipecaml@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
staging: csr: remove CONFIG_HOTPLUG ifdefs 2012-11-21T23:04:58+00:00 Bill Pemberton wfp5p@virginia.edu 2012-11-19T18:19:22+00:00 941906647a12749ae769b3414f652f1f03e22f69 Remove conditional code based on CONFIG_HOTPLUG being false. It's always on now in preparation of it going away as an option. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
Remove conditional code based on CONFIG_HOTPLUG being false.  It's
always on now in preparation of it going away as an option.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
staging: csr: csr_wifi_hip_unifi_signal_names: Fix pointer position 2012-11-06T08:32:17+00:00 Hojung Youn amoc.yn@gmail.com 2012-11-02T21:10:20+00:00 fb7d2ebd217a2a3cead4402b47c65c25881a2f75 Fixed pointers' positions in the csr_wifi_hip_unifi_signal_names.c file that were identifed by checkpatch.pl tool. Signed-off-by: Hojung Youn <amoc.yn@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
Fixed pointers' positions in the csr_wifi_hip_unifi_signal_names.c file
that were identifed by checkpatch.pl tool.

Signed-off-by: Hojung Youn <amoc.yn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
staging: csr: csr_wifi_hip_unifi_signal_names: fix whitespaced paddings 2012-11-06T08:32:17+00:00 Hojung Youn amoc.yn@gmail.com 2012-11-02T21:10:19+00:00 65dbeb195ad1070fcee669edca2a30916ca59f6d Fixed whitespace paddings in the csr_wifi_hip_unifi_signal_names.c file that were, though, not identified by checkpatch.pl tool. Signed-off-by: Hojung Youn <amoc.yn@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
Fixed whitespace paddings in the csr_wifi_hip_unifi_signal_names.c file
that were, though, not identified by checkpatch.pl tool.

Signed-off-by: Hojung Youn <amoc.yn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
staging: csr: csr_wifi_hip_unifi_signal_names: fix brackets 2012-11-06T08:32:17+00:00 Hojung Youn amoc.yn@gmail.com 2012-11-02T21:10:18+00:00 a90770e0c33dd94375a81836daa91839f51a81ce Fixed brackets' positions in the csr_wifi_hip_unifi_signal_names.c file that were identified by checkpatch.pl tool. Some brackets are removed which are not needed by the rule of CodingStyle documentation. Signed-off-by: Hojung Youn <amoc.yn@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
Fixed brackets' positions in the csr_wifi_hip_unifi_signal_names.c file
that were identified by checkpatch.pl tool.  Some brackets are removed
which are not needed by the rule of CodingStyle documentation.

Signed-off-by: Hojung Youn <amoc.yn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
staging: csr: csr_wifi_hip_unifi_signal_names: fix indent 2012-11-06T08:32:17+00:00 Hojung Youn amoc.yn@gmail.com 2012-11-02T21:10:17+00:00 279dda68e2dcb19c46cb62dd2899d8dac6a9b7aa Fixed indent style in the csr_wifi_hip_unifi_signal_names.c file that were identified by checkpatch.pl tool. All whitespaced indents are converted into tab characters, except ones in the topmost commentation. Signed-off-by: Hojung Youn <amoc.yn@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
Fixed indent style  in the csr_wifi_hip_unifi_signal_names.c
file that were identified by checkpatch.pl tool. All whitespaced
indents are converted into tab characters,  except ones in the
topmost commentation.

Signed-off-by: Hojung Youn <amoc.yn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>