summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-03-17Merge 3.14-rc7 into staging-nextGreg Kroah-Hartman
This resolves a merge issue with drivers/staging/cxt1e1/linux.c that was fixed in a report from Stephen Rothwell Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-17staging: bcm: Typedefs.h Fix "foo * bar" warning.Aybuke Ozdemir
This patch fixes these error messages found by checkpatch.pl: ERROR: "foo* bar" should be "foo *bar" Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: bcm: Typedefs.h Fix do not use // c99 comments.Aybuke Ozdemir
This patch fixes "do not use // C99 comments" errors in Typedefs.h Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: vt6656: power.c Fix line over 80 characters.Aybuke Ozdemir
Fix checkpatch.pl issue with line over 80 characters in power.c Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: nokia_h4p: nokia_fw-bcm.c Fix line over 80 characters.Aybuke Ozdemir
Fix checkpatch.pl issue with line over 80 characters in nokia_fw-bcm.c Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: winbond: Moved trailing statement to next lineGulsah Kose
Fix checkpatch.pl issues with trailing statement to next line in wb35reg.c Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: cxt1e1: Fix space prohibited between function name and open parenthesisGulsah Kose
Fix checkpatch.pl issues with space prohibited between function name and open parenthesis in libsbew.h Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: dgnc: Fix quoted string split across lines warningGulsah Kose
This patch fixes "quoted string split across lines warning" warning in dgnc_cls.c Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: line6: Fix line over 80 charactersGulsah Kose
Fix checkpatch.pl issue with line over 80 characters in midi.c Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging:keucr: Remove typedefsHimangi Saraogi
As suggested by Pablo, this patch uses a coccinelle script to remove the typedefs: typedef u8 BOOLEAN; <-- use "bool" instead. typedef u8 BYTE; <-- use "u8" typedef u8 *PBYTE; <-- use "u8 *" typedef u16 WORD; <-- use "u16" typedef u16 *PWORD; <-- use "u16 *" typedef u32 DWORD; <-- use "u32" typedef u32 *PDWORD; <-- use "u32 *" in common.h. The coccinelle script is: /* coccinelle script to remove typedefs. */ @remove_typedef@ @@ -typedef bool BOOLEAN; -typedef u8 BYTE; -typedef u8 *PBYTE; -typedef u16 WORD; -typedef u16 *PWORD; -typedef u32 DWORD; -typedef u32 *PDWORD; @fix_usage@ typedef BOOLEAN; @@ -BOOLEAN +bool @fix_usage1@ typedef BYTE; @@ -BYTE +u8 @fix_usage2@ typedef PBYTE; @@ -PBYTE +u8 * @fix_usage3@ typedef WORD; @@ -WORD +u16 @fix_usage4@ typedef PWORD; @@ -PWORD +u16 * @fix_usage5@ typedef DWORD; identifier f; @@ -DWORD +u32 @fix_usage6@ typedef PDWORD; @@ -PDWORD +u32 * Signed-off-by: Himangi Saraogi <himangi774@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: rtl8187se: Remove initialization of static variable in ↵Ana Rey
ieee80211/ieee80211_softmac.c Fix checkpatch.pl errors: ERROR: do not initialise statics to 0 or NULL Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: rtl8187se: Fix pointer declarations in ieee80211/ieee80211_softmac.cAna Rey
Fix pointer declarations as the codingStyle of the kernel recommends in ieee80211/ieee80211_softmac.c Fix checkpatch.pl errors: ERROR: "foo* bar" should be "foo *bar" ERROR: "(foo*)" should be "(foo *)" Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: rtl8187se: Move trailing statement to next lineAna Rey
Move trailing statements to next line as the codingStyle of the kernel recommends. Fix checkpatch.pl errors: ERROR: trailing statements should be on next line Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: rtl8187se: Delete some innecesary whitespacesAna Rey
Delete some whitespaces (whitespace before a quoted newline, space at the start of a line and space before a tabs) as the codingStyle of the kernel recommends. Fix checkpatch.pl errors: WARNING: unnecessary whitespace before a quoted newline WARNING: please, no spaces at the start of a line WARNING: please, no space before tabs Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: rtl8187se: Add whitespaces around '&', '||' and '&&'Ana Rey
Add whitespaces around '&', '||' and '&&' as the codingStyle of the kernel recommends. Fix checkpatch.pl errors: ERROR: spaces required around that '||' (ctx:VxV) ERROR: spaces required around that '&&' (ctx:VxV) ERROR: need consistent spacing around '&' Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: rtl8187se: Add whitespaces around '+=' and '=='Ana Rey
Add whitespaces around '+=' and '==' and fix coding style in these lines as the codingStyle of the kernel recommends. Fix checkpatch.pl errors: ERROR: spaces required around that '+=' (ctx:VxV ERROR: spaces required around that '==' (ctx:VxW) Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: rtl8187se: Fix "code indent should use tabs where possible" errorAna Rey
Fix checkpatch.pl error: ERROR: code indent should use tabs where possible Also fix some problems with tabs in an if-statement. Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: rtl8187se: Add whitespaces around commasAna Rey
Add whitespaces around commas and fix coding style in these lines as the codingStyle of the kernel recommends. Fix checkpatch.pl errors: ERROR: space required after that ',' Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: rtl8187se: Add whitespaces around '+', '-' and '='Ana Rey
Add whitespaces around '+', '-' and '=' as the codingStyle of the kernel recommends. Fix checkpatch.pl errors: ERROR: need consistent spacing around '+' ERROR: spaces required around that '=' (ctx:VxV) ERROR: need consistent spacing around '-' Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: rtl8187se: Delete spaces prohibited around semicolons, colons and ↵Ana Rey
exclamations Delete spaces prohibited before semicolon, before ':' and after '!' and fix coding style in these lines when It is necessary. Fix checkpàtch.pl error and warning messages: WARNING: space prohibited before semicolon ERROR: space prohibited before that ':' ERROR: space prohibited after that '!' Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: rtl8187se: Delete space prohibited after open parenthesis.Ana Rey
Delete space prohibited after open parenthesis and fix coding style in the lines changed when It is necessary Fix checkpatch.pl errors: ERROR: space prohibited after that open parenthesis '(' Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: rtl8187se: Delete space prohibited between function name and open ↵Ana Rey
parenthesis Delete space prohibited between function name and open parenthesis and fix coding style in the lines changed when It is necessary Fix checkpatch.pl warning message: WARNING: space prohibited between function name and open parenthesis '('. Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: rtl8187se: Add whitespaces in while and for structures.Ana Rey
Add a space required before the open parenthesis in while and for structures as the codingStyle of the kernel recommends. Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: rtl8187se: Add whitespaces between 'if' and the condition.Ana Rey
Add a space required before the open parenthesis in conditional statements as the codingStyle of the kernel recommends. Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: rtl8187se: Delete braces are not necessary in ↵Ana Rey
ieee80211/ieee80211_softmac.c Delete braces are not necessary for single statement blocks and fix coding style in these lines when It is necessary. Fix checkpatch.pl warning: WARNING: braces {} are not necessary for single statement blocks Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: rtl8187se: Add necessary whitespaces in while and do-while statements.Ana Rey
Fix whitespaces in do-while statements and while statements as the codingStyle of the kernel recommends in ieee80211/ieee80211_softmac.c Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: rtl8187se: Fix whitespace around else-statementsAna Rey
Fix whitespaces around else-statements and fix coding style in the lines when It is necessary as the codingStyle of the kernel recommends in ieee80211/ieee80211_softmac.c Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: rtl8187se: Fix whitespaces in if-statement.Ana Rey
Fix whitespaces around braces in if-statement as the codingStyle of the kernel recommends in ieee80211/ieee80211_softmac.c Also, fix coding style in these lines when It is necessary. Fix checkpatch.pl errors: ERROR: space required before the open brace '{' Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: rtl8187se: Remove unused functions 'rsn_authen_cipher_suite' and ↵Ana Rey
'ext_ieee80211_send_beacon_wq' Remove unused functions rsn_authen_cipher_suite() and ext_ieee80211_send_beacon_wq() from ieee80211_softmac.c. Fix sparse warnings: drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c:27:11: warning: ‘rsn_authen_cipher_suite’ defined but not used [-Wunused-variable] drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c:327:13: warning: ‘ext_ieee80211_send_beacon_wq’ defined but not used [-Wunused-function] Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: rtl8187se: Re-write if statement with comment lines inside.Ana Rey
Move comments from inside if conditionals to the lines above the if-statement. Also delete unnecessary whitespace in these lines. Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: rtl8187se: Clean-up comment line styleAna Rey
Convert style of comments from C99-style to C89 and fix alignment in these lines as the CodingStyle recommends. Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: rtl8187se: Remove unnecessary blank linesAna Rey
Remove unnecessary blank lines in ieee80211/ieee80211_softmac.c (and add some necessary blank lines). Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: rtl8187se: Delete commented codeAna Rey
Delete all commented code in ieee80211/ieee80211_softmac.c that are not necessary. Also, remove the unused variable referenced in the commented code. Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: media/omap24xx/tcm825x.h removed warningUma Sharma
This patch removes the following checkpatch.pl warning in tcm825x.h Warning : missing space after return type Signed-off-by: Uma Sharma <uma.sharma523@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: media/msi3101/sdr-msi3101.c removed warningUma Sharma
This patch removes the following checkpatch.pl warning in sdr-msi3101.c Warning : Unnecessary space after function pointer name Signed-off-by: Uma Sharma <uma.sharma523@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: crystalhd: Fix no space before tabsGulsah Kose
This patch fixes no spaces before tabs warning in crystalhd_misc.h Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: go7007: go7007-v4l2.c Fix line over 80 characters.Aybuke Ozdemir
Fix checkpatch.pl issues with line over 80 characters in go7007-v4l2.c Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: octeon: ethernet-mdio.c Fix line over 80 characters.Aybuke Ozdemir
Fix checkpatch.pl issue with line over 80 characters in ethernet-mdio.c Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17Staging: bcm: Removed unreachable code line in Bcmchar.cEbru Akagunduz
This patch removes unreachable code line and unnecessary braces in Bcmchar.c Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com> Acked-by: Bob Copeland <me@bobcopeland.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17Staging: bcm: fix line over 80 characters in Bcmchar.cEbru Akagunduz
Fix checkpatch.pl issues with line over 80 characters in Bcmchar.c Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: removed space after return function in gdm_lte.hUma Sharma
This patch removes the following checkpatch.pl warning in gdm_lte.h Warning : space after return function Signed-off-by: Uma Sharma <uma.sharma523@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: nokia_h4p: Fix quoted string split across linesGulsah Kose
This patch fixes "quoted string split across lines warning" warning in nokia_core.c Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: frontier: Fix quoted string split across linesGulsah Kose
This patch fixes "quoted string split across lines warning" warning in alphatrack.c Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: lustre: Remove extern keyword from function prototypesAshley Smith
A function prototype is always a declaration and thus has "extern" prepended by default. Signed-off-by: Ashley Smith <ashley@eclipso.ch> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: silicom: Fix line over 80 characters.Gulsah Kose
Fix checkpatch.pl issues with line over 80 characters in bp_mod.h Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: gdm72xx: remove completed TODO itemKristina Martšenko
Remove an item from the TODO file since it appears to have been completed by the following commits: * 1839c7ebd9 "staging/gdm72xx: usb_boot: replace firmware upgrade API" * 3afcb91c41 "staging/gdm72xx: usb_boot: replace firmware upgrade API in em_download" * 9e412a0a58 "staging/gdm72xx: sdio_boot: replace firmware upgrade API" Signed-off-by: Kristina Martšenko <kristina.martsenko@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: gdm72xx: replace printk() and debug macros with dynamic debuggingKristina Martšenko
Replace printk(KERN_DEBUG ...) with netdev_dbg and dev_dbg. Remove debug macros which become unnecessary. This removes the following types of checkpatch warnings from the driver: drivers/staging/gdm72xx/gdm_sdio.c:461: WARNING: Prefer netdev_dbg(netdev, ... then dev_dbg(dev, ... then pr_debug(... to printk(KERN_DEBUG ... Signed-off-by: Kristina Martšenko <kristina.martsenko@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: gdm72xx: use print_hex_dump_debug and remove debug macrosKristina Martšenko
Since the kernel already has a function for hex dumps, use that instead of the driver's own versions. The function supports dynamic debugging, so also remove some unnecessary debug macros. Signed-off-by: Kristina Martšenko <kristina.martsenko@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: gdm724x: gdm_usb.c: Fix line over 80 characters.Aybuke Ozdemir
Fix checkpatch.pl issues with line over 80 characters in gdm_usb.c Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-17staging: vt6655: Fix line over 80 characters.Gulsah Kose
Fix checkpatch.pl issues with line over 80 characters in 80211mgr.c Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>