1
0
Fork 0
Commit Graph

186 Commits (51d95709dddf7fdf6769a547de37a9c98edf8df9)

Author SHA1 Message Date
Linus Torvalds b5c78e04dd Staging tree update for 3.9-rc1
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.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iEUEABECAAYFAlEmW7QACgkQMUfUDdst+ymlIACXT5mv8Y5A/KJa+QLTNNsofI8u
 aACgq9hNZxJzX6VQMLXUV8+2SILOqYo=
 =5wIj
 -----END PGP SIGNATURE-----

Merge tag 'staging-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

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
  ...
2013-02-21 12:11:44 -08:00
Cyril Roelandt 1901ab6292 staging: wlags49_h2: remove unneeded memset() in wireless_get_bssid()
A few lines after this call, we memcpy over the same memory area, so the call to
memset is not necessary.

Signed-off-by: Cyril Roelandt <tipecaml@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:08:12 -08:00
Johan Meiring e5516fd34e staging: wlags49_h2: wl_util: corrects asterisk placement
This commit fixes incorrect placement of the asterisk character.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:03:44 -08:00
Johan Meiring 3bba6195bb staging: wlags49_h2: wl_util: converts C99 // comment
This commit converts a C99 // comment to /* */

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:03:44 -08:00
Johan Meiring 76abcc5191 staging: wlags49_h2: wl_util: fixes spacing around parentheses
This commit corrects the spacing in an and around parentheses in the
file.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:03:44 -08:00
Johan Meiring a52a2e1d09 staging: wlags49_h2: wl_priv: converts C99 // comments
This commit converts C99 // comments to /* */

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:03:44 -08:00
Johan Meiring fdd9e86039 staging: wlags49_h2: wl_priv: converts indentation to tabs
This commit converts instances of space-based indentation to tabs.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:03:44 -08:00
Johan Meiring 7f622485ee staging: wlags49_h2: wl_priv: fixes brace placement
This commit fixes incorrect brace placements in the file, as
indicated by the checkpatch.pl tool.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:03:43 -08:00
Johan Meiring ac6cf1b8e4 staging: wlags49_h2: wl_priv: fixes case statement styling issues
This commit fixes issues related to the styling of case statements.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:03:43 -08:00
Johan Meiring c54a639086 staging: wlags49_h2: wl_priv: fixes incorrect #include
This commit forces the file to use <linux/uaccess.h> instead of
<asm/uaccess.h>. Everything still compiles a-OK.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:03:43 -08:00
Johan Meiring 0af2d465dd staging: wlags49_h2: wl_priv: fixes parentheses styling issues
This commit fixes further parentheses styling issues as identified
by the checkpatch.pl tool.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:03:40 -08:00
Johan Meiring ceb121ae22 staging: wlags49_h2: wl_priv: fixes spacing around parentheses
This commit fixes many instances where the spacing in and around
parentheses was applied incorrectly.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:03:34 -08:00
Johan Meiring ba4126a7cd staging: wlags49_h2: wl_profile.h: fixes C99 // comment
This commit converts a C99 // comment to /* */. The checkpatch.pl
tool reports that this file has no further styling issues.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:03:34 -08:00
Johan Meiring 580dccd974 staging: wlags49_h2: wl_profile.h: fixes spacing around parentheses
This commit cleans up the spacing around parentheses.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:03:34 -08:00
Johan Meiring 61fc9c89b2 staging: wlags49_h2: sta_h2: corrects C99 // comments
This commit converts C99 // comments to /* */

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:03:34 -08:00
Johan Meiring de199db35e staging: wlags49_h2: sta_h2: fixes casting style issue
This commit cleans up a styling issue when casting to "hcf_8 *".

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:03:34 -08:00
Johan Meiring d641f16488 staging: wlags49_h2: sta_h2: fixes spaces around parentheses
This commit fixes an instance where the spacing around parentheses
was incorrect.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:03:33 -08:00
Johan Meiring b7a5b4760f staging: wlags49_h2: sta_h2: fixes malformed #include filename
This minor change simply removes quotations from within a comment
so that the checkpatch.pl tool won't complain about a malformed
include filename anymore.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:03:33 -08:00
Johan Meiring 497d4140ab staging: wlags49_h2: sta_h2: fixes spaces-before-tabs problems
This commit various cases where there were spaces before tabs, as
reported by the checkpatch.pl tool.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:03:33 -08:00
Johan Meiring 79249c4b22 staging: wlags49_h2: wl_netdev.h: sorts out spacing issues
This commit fixes issues regarding spacing around parentheses. The
checkpatch.pl tool reports that this file has no further styling
issues.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:03:33 -08:00
Johan Meiring 2dddc56293 staging: wlags49_h2: wl_netdev.h: converts C99 // comments
This commit converts C99 // comments to /* */

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:03:33 -08:00
Johan Meiring 30b437db2a staging: wlags49_h2: wl_priv.h: fixes instances of 80+ char lines
This commit corrects cases where lines where longer than 80
characters.  checkpatch.pl now reports that this file has no further
issues.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:03:33 -08:00
Johan Meiring 067f0dc33a staging: wlags49_h2: wl_priv.h: converts C99 // comments
This commit converts C99 // comments to /* */

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:03:33 -08:00
Johan Meiring 00871bc0f8 staging: wlags49_h2: wl_priv.h: fixes spacing around parentheses
This commit fixes the incorrect spacing around parentheses.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:03:32 -08:00
Johan Meiring 13821d96d4 staging: wlags49_h2: wl_enc: fixes incorrect use of return
This commit removes parentheses that were used as part of return
statements, seeing as how return is not a function.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:03:32 -08:00
Johan Meiring f83a7c34d4 staging: wlags49_h2: wl_enc: corrects spacing around colons
This commit fixes incorrect use of spaces around colons.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:03:32 -08:00
Johan Meiring 2d33309ef9 staging: wlags49_h2: wl_enc: corrects spacing around parentheses
This commit corrects various instances where the use of spaces
around parentheses was incorrect.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:03:32 -08:00
Johan Meiring 9413127a92 staging: wlags49_h2: wl_enc: converts indentation spaces to tabs
This commit converts space-based indentation to tabs.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:03:32 -08:00
Johan Meiring 4f55b5d494 staging: wlags49_h2: ap_h25: corrects incorrect use of // comments
This commit converts C99 // comments to /* */

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:03:32 -08:00
Johan Meiring 524cb2e503 staging: wlags49_h2: ap_h25: corrects casting styling issue
This commit corrects a casting styling issue as reported by the
checkpatch.pl tool.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:03:32 -08:00
Johan Meiring d692b695e7 staging: wlags49_h2: ap_h25: corrects malformed #include warning
This extremely minor commit removes quotation marks from within a
comment so that the checkpatch.pl tool won't complain about the
line in question anymore.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:03:31 -08:00
Johan Meiring ed3125c82a staging: wlags49_h2: ap_h25: corrects parentheses styling issue
This commit corrects incorrect spaces around parentheses.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:03:31 -08:00
Johan Meiring ef8271dc6c staging: wlags49_h2: ap_h25: corrects tabs/spaces syling issues
This commit corrects tabs and spaces issues as reported by the
checkpatch.pl tool.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:03:31 -08:00
Johan Meiring 6dc69c2b83 staging: wlags49_h2: ap_h2: corrects a pointer styling issue
This commit correct a pointer styling issue as reported by the
checkpatch.pl tool.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-07 11:03:31 -08:00
Jiri Pirko 7826d43f2d ethtool: fix drvinfo strings set in drivers
Use strlcpy where possible to ensure the string is \0 terminated.
Use always sizeof(string) instead of 32, ETHTOOL_BUSINFO_LEN
and custom defines.
Use snprintf instead of sprint.
Remove unnecessary inits of ->fw_version
Remove unnecessary inits of drvinfo struct.

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-01-06 21:06:31 -08:00
Bill Pemberton a1fc9d87a1 staging: wlags49_h2: remove use of __devexit
CONFIG_HOTPLUG is going away as an option so __devexit is no
longer needed.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-21 13:54:04 -08:00
Bill Pemberton cea69a149a staging: wlags49_h2: remove use of __devinitdata
CONFIG_HOTPLUG is going away as an option so __devinitdata is no
longer needed.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-21 13:54:04 -08:00
Bill Pemberton a7d712aa3a staging: wlags49_h2: remove use of __devinit
CONFIG_HOTPLUG is going away as an option so __devinit is no longer
needed.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-21 13:54:04 -08:00
Bill Pemberton 1a65e20496 staging: wlags49_h2: remove use of __devexit_p
CONFIG_HOTPLUG is going away as an option so __devexit_p is no longer
needed, remove it.

This also changes the syntax for the initialization of the wl_driver
struct to match convention.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-21 13:54:04 -08:00
Johan Meiring bfdc409770 staging: wlags49_h2: ap_h2.c: fixes spaces-before-tabs problems
This commit sorts out a few instances of spaces before tabs, as
reported by the checkpatch.pl tool.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-21 13:53:27 -08:00
Johan Meiring 0da7da721a staging: wlags49_h2: wl_if.h: gets rid of C99 // comments
This commit converts all C99 // comments to standard /* */ comments

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-21 13:53:27 -08:00
Johan Meiring 5aeb6fcbab staging: wlags49_h2: wl_if.h: fixes brace placement
This commit fixes incorrect brace placement, as reported by the
checkpatch.pl tool.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-21 13:53:27 -08:00
Johan Meiring 74a9369024 staging: wlags49_h2: wl_if.h: fixes 80 char line length issues
This commit sorts out 80+ char line length issues that were reported
by the checkpatch.pl tool.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-21 13:53:27 -08:00
Johan Meiring 38a4450635 staging: wlags49_h2: wl_if.h: fixes spaces-before-tabs issue
This commit fixes a spaces-before-tabs problem that was reported by
the checkpatch.pl tool.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-21 13:53:27 -08:00
Johan Meiring 3d09d2054d staging: wlags49_h2: wl_if.h: fixes tab indentation
This commit sorts out the tab & space indentation problems that were
reported by the checkpatch.pl tool.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-21 13:53:27 -08:00
Johan Meiring 01fd5732de staging: wlags49_h2: wl_if.h: fixes macro styling issues
This commit sorts out macro styling issues that were indicated by
the checkpatch.pl script,

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-21 13:53:27 -08:00
Kees Cook a51d02067e drivers/staging/wlags49_h2/man: remove CONFIG_EXPERIMENTAL
This config item has not carried much meaning for a while now and is
almost always enabled by default. As agreed during the Linux kernel
summit, remove it.

CC: Henk de Groot <pe1dnn@amsat.org>
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-23 20:28:19 -07:00
Justin P. Mattock 86f9150c90 staging: "wlags49_h2" Fix typos.
Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-10 20:24:01 -07:00
Wei Yongjun 84bda90931 staging: wlags49_h2: use list_move instead of list_del/list_add
Using list_move() instead of list_del() + list_add().

spatch with a semantic match is used to found this problem.
(http://coccinelle.lip6.fr/)

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-06 09:25:22 -07:00
Wei Yongjun 4f19b38f13 staging: wlags49_h2: use is_broadcast_ether_addr() instead of memcmp()
Using is_broadcast_ether_addr() instead of directly use
memcmp() to determine if the ethernet address is broadcast
address.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04 13:16:26 -07:00