Commit Graph

20593 Commits

Author SHA1 Message Date
Teodora Baluta
938db28b33 staging: vt6655: put brace on previous line
Place braces on same line for code statements. Fix the following
checkpatch.pl type of error for drivers/staging/vt6655/bssdb.c file:

ERROR: that open brace { should be on the previous line

Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 11:13:30 -08:00
Teodora Baluta
b4f66ad83b staging: vt6655: put trailing statements on next line
This patch fixes the following type of checkpatch.pl errors in
drivers/staging/vt6655/bssdb.c file:

ERROR: trailing statements should be on next line

Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 11:03:18 -08:00
Teodora Baluta
347a0475a6 staging: vt6655: remove braces for single statement blocks
This patch removes braces for single statement blocks, clearing these
types of checkpatch.pl warnings:

WARNING: braces {} are not necessary for single statement blocks
WARNING: braces {} are not necessary for any arm of this statement

Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 11:03:18 -08:00
Teodora Baluta
383956442d staging: vt6655: replace C99 comments wtih C89 comments
This patch replaces C99 comments with /* .. */ comments. Any commented
code is deleted.

Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 11:01:41 -08:00
Nandini Hanumanthagowda
ebd381d985 staging: vt6656: fixed whitespace related errors around operators
removed prohibited spaces around operators and added required
spaces around operators wherever necessary to fix checkpatch
errors

Signed-off-by: Nandini Hanumanthagowda <nandu.hgowda@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 10:59:33 -08:00
Valentina Manea
3b1388518a staging: vt6656: Fix (most) sparse warnings regarding static functions/variables
This fixes sparse warnings for functions and variables, e.g.:
* drivers/staging/vt6656/card.c:69:11: warning: symbol 'cwRXBCNTSFOff'
was not declared. Should it be static?

Some warnings were false positives, such as:
* drivers/staging/vt6656/dpc.c:249:5: warning: symbol 'RXbBulkInProcessData'
was not declared. Should it be static?

Signed-off-by: Valentina Manea <valentina.manea.m@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 10:57:33 -08:00
Archana kumari
1e01f94317 staging: vt6655: fixed sparse warning for static declaration in wpa2.c
This patch fixes sparse warning for static declaration in wpa2.c

Signed-off-by: Archana kumari <archanakumari959@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Reviewed-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 10:56:12 -08:00
Ebru Akagunduz
51d6774a91 Staging: rtl8187se: fix printk() should include kern_ facility level
Fix checkpatch.pl issues with printk() should
include kern_ facility level in r8185b_init.c

Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 09:50:40 -08:00
Teodora Baluta
06fcedc8ea staging: lustre: remove initialisation of static variable
Fix the following checkpatch.pl error:

ERROR: do not initialise statics to 0 or NULL
+static int       libcfs_nidstring_idx = 0;

Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 09:46:32 -08:00
Teodora Baluta
0b2b3070f1 staging: lustre: place EXPORT_SYMBOL after its function
This patch fixes the following type of warnings detected by
checkpatch.pl:

WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable

Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 09:46:32 -08:00
Teodora Baluta
b008e65cc2 staging: lustre: remove space between function name and open parenthesis
This fixes the following checkpatch.pl warnings:

WARNING: space prohibited between function name and open parenthesis '('

Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 09:46:32 -08:00
Dulshani Gunawardhana
33700ac776 staging:lustre: Fix plain integer as NULL pointer warning
Fix the sparse warning of 'Using plain integer as NULL pointer' in lproc_lov.c.

Signed-off-by: Dulshani Gunawardhana <dulshani.gunawardhana89@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 09:44:57 -08:00
Himangi Saraogi
fb3e170cfa Staging: rtl8187se: Remove C99 style commenting
This patch fixes the checkpatch.pl warning
"do not use C99 // comments"
in ieee80211/ieee80211_softmac.c.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 09:13:22 -08:00
Himangi Saraogi
62953c869f Staging: rtl8187se: Fix indentation errors
This patch fixes the checkpatch.pl warnings "code indent should use
tabs where possible" in ieee80211/ieee80211_softmac.c.
Also unnecessary blanks lines are removed.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Reviewed-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 09:13:22 -08:00
Himangi Saraogi
821aa20462 Staging:rtl8187se: Remove unnecessary braces from if-else statement
This patch fixes the checkpatch.pl warning
braces {} are not necessary for any arm of this statement
in ieee80211/ieee80211_softmac.c.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 09:11:16 -08:00
Himangi Saraogi
4270826c69 Staging:rtl8187se: Add space before open parenthesis of if condition
This patch fixes the checkpatch.pl warning :
space required before the open parenthesis '('
in ieee80211/ieee80211_softmac.c.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 09:11:16 -08:00
Ana Rey Botello
2063cd4156 Staging: rtl8187se: use macro IW_HANDLER to initialize r8180_wx_handlers
Use IW_HANDLER to initialize iw_handler structure like in others wireless
driver.

Acked-by: Pablo Neira Ayuso <pablo@gnumonks.org>
Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 09:03:50 -08:00
Himangi Saraogi
1fcd806703 Staging:rtl8187se: Insert spaces after commas
This patch fixes the checkpatch.pl warnings
space required after that ',' in ieee80211/ieee80211_softmac.c

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Reviewed-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 09:03:50 -08:00
Himangi Saraogi
5b74ff92d3 staging:rtl8187se: Use preferred library linux/uaccess.h over asm/uaccess.h
This patch fixes the checkpatch.pl warning "Use #include
<linux/uaccess.h> instead of <asm/uaccess.h>" in
ieee80211/ieee80211_softmac.c .

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Reviewed-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 09:03:49 -08:00
Himangi Saraogi
17295913d8 staging:rtl8187se: Shift open brace of function declarations to next line
This patch fixes the checkpatch.pl error "open brace '{' following
function declarations go on the next line" in ieee80211_softmac.c.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Reviewed-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 09:03:49 -08:00
Himangi Saraogi
52c5c2e0bc Staging: rtl8187se: Fix C99 style commenting in dot11d.h
This patch fixes the checkpatch.pl error "do not use C99 // comments"
in ieee80211/dot11d.n.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 08:47:13 -08:00
Rashika Kheria
caace4b531 Staging: rtl8187se: Remove useless comments in dot11d.c
This patch removes unnecessary comments in ieee80211/dot11d.c.

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 08:44:21 -08:00
Rashika Kheria
4a0b1c4181 Staging: rtl8187se: Remove unnecessary return statement in ieee80211_crypt_tkip.c
This patch removes an unnecessary return statement in the function
ieee80211_tkip_null() in ieee80211/ieee80211_crypt_tkip.c.

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 08:44:21 -08:00
Rashika Kheria
5befdae5b5 Staging: rtl8187se: Fix code indent should use tabs in ieee80211_crypt_tkip.c
This patch fixes the following checkpatch.pl issues in
ieee80211/ieee80211_crypt_tkip.c-
ERROR: code indent should use tabs where possible

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 08:44:21 -08:00
Rashika Kheria
080b94a713 Staging: rtl8187se: Replace "foo * bar" with "foo *bar" in ieee80211_crypt_tkip.c
This patch fixes the following checkpatch.pl issues in
ieee80211/ieee80211_crypt_tkip.c-
ERROR: "foo * bar" should be "foo *bar"

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 08:44:21 -08:00
Rashika Kheria
1cf5ef1c46 Staging: rtl8187se: Remove useless comments in ieee80211_crypt_tkip.c
This patch removes useless comments in ieee80211/ieee80211_crypt_tkip.c.
And, hence also removes the following checkpatch.pl issue-
ERROR: do not use C99 // comments

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 08:44:21 -08:00
Rashika Kheria
c6a2c52f45 Staging: rtl8187se: Fix quoted strings split across lines in ieee80211_crypt_ccmp.c
This patch fixes the following checkpatch.pl issues in
ieee80211/ieee80211_crypt_ccmp.c-
WARNING: quoted string split across lines

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 08:44:21 -08:00
Rashika Kheria
734412501b Staging: rtl8187se: Remove unnecessary comments in ieee80211_crypt_ccmp.c
This patch removes unnecessary comments written in ieee80211/ieee80211_crypt_ccmp.c.
And hence also, removes the following checkpatch.pl issue-
ERROR: do not use C99 // comments

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 08:44:21 -08:00
Rashika Kheria
10aff642fd Staging: rtl8187se: Fix line over 80 characters in dot11d.c
This patch fixes the following checkpatch.pl issues in
ieee80211/dot11d.c-
WARNING: line over 80 characters

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 08:44:21 -08:00
Rashika Kheria
96983a0c65 Staging: rtl8187se: Remove unnecessary braces around single statement in dot11d.c
This patch fixes the following checkpatch.pl issues in
ieee80211/dot11d.c-
WARNING: braces {} are not necessary for single statement blocks

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 08:44:21 -08:00
Rashika Kheria
3e3f837c65 Staging: rtl8187se: Fix space prohibited before semicolon in dot11d.c
This patch fixes the following checkpatch.pl issues in
ieee80211/dot11d.c-
WARNING: space prohibited before semicolon

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 08:44:21 -08:00
Rashika Kheria
d58df7513d Staging: rtl8187se: Fix printk() should include KERN_ facility level
This patch fixes the following checkpatch.pl issues in
ieee80211/dot11d.c-
WARNING: printk() should include KERN_ facility level

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 08:44:21 -08:00
Rashika Kheria
8e0e3aeede Staging: rtl8187se: Fix C99 style commenting in dot11d.c
This patch fixes the following checkpatch.pl issues in
ieee80211/dot11d.c-
ERROR: do not use C99 // comments

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 08:44:21 -08:00
Himangi Saraogi
0c4c9350c1 drivers : staging :rtl8187se : r8180_core.c : remove space before semicolon
This patch removes the checkpatch.pl warning space prohibited before
semicolon.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 08:42:13 -08:00
Sima Baymani
49f4a9c81c staging: imx-drm: remove unnecessary braces
Fix checkpatch warning by removing unnecessary braces.
Compile-tested the single file.

Signed-off-by: Sima Baymani <sima.baymani@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Reviewed-by: Archana Kumari <archanakumari959@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 08:07:20 -08:00
Archana kumari
5354cb6423 staging: imx-drm: Fix warning for static const char * array in imx-ldb.c
This patch fixes the warning "static const char * array should
probably be static const char * const" in imx-ldb.c.

Signed-off-by: Archana kumari <archanakumari959@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 08:07:20 -08:00
Sima Baymani
9b38da66d0 staging: cxt1e1: fix long lines warning
Break up long lines per checkpatch warnings.

Signed-off-by: Sima Baymani <sima.baymani@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 08:05:15 -08:00
Sima Baymani
987e8bef1c staging: cxt1e1: remove typedef comet_t
Remove typedef declaration per checkpatch warning.
Built and loaded.

Signed-off-by: Sima Baymani <sima.baymani@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 08:05:15 -08:00
Sima Baymani
af2594402d staging: cxt1e1: comet,h - fix placement of braces
Fix bad placement of braces per checkpatch warning.

Signed-off-by: Sima Baymani <sima.baymani@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 08:03:32 -08:00
Sima Baymani
353808bf53 staging: cxt1e1: comet.h - fix long lines warning
Fix long lines warnings from checkpatch which were introduced in
previous patch in series due to reindentation.

Signed-off-by: Sima Baymani <sima.baymani@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 08:03:32 -08:00
Sima Baymani
89c05d2781 staging: cxt1e1: comet.h - fix wrong indentation
Reindent needed parts of comet.h per checkpatch warnings - whitespace
changes only.

This patch introduces long line warnings because of the reindentation.
Those warnings are fixed by the next patch in series.

Signed-off-by: Sima Baymani <sima.baymani@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 08:03:32 -08:00
Dulshani Gunawardhana
ae6a214b3b staging/cxt1e1:Fixes incorrect brace placement
This patch fixes the error "This open brace { should be on the
above line" detected via checkpatch.pl.

Signed-off-by: Dulshani Gunawardhana <dulshani.gunawardhana89@gmail.com>
Reviewed-by: Zach Brown <zab@redhat.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 07:58:55 -08:00
Kelley Nielsen
8d6c558557 staging: ft1000: fix remaining checkpatch issues in ft1000_hw.c
The file ft1000_hw.c is still full of coding style problems that make it
challenging to read and understand. The lines inside the switch cases
in ft1000_proc_drvmsg() are indented too deeply, so remove one leading
tab. Join lines that are now able to fit in the 80 character limit.
This will take care of the "too many leading tabs" issue. Run
checkpatch.pl on the file, and correct all other issues it reports
(except lines with user visible strings over 80 chars).

Signed-off-by: Kelley Nielsen <kelleynnn@gmail.com>
Suggested-by: Waskiewicz Jr, Peter P <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 07:55:00 -08:00
Kelley Nielsen
a3220b89bd staging: ft1000: flatten nesting in dsp_broadcast_msg_id()
The function dsp_broadcast_msg_id() has four levels of nesting. Move the
handling for failed allocation for *dpram_blk from the else block at the
end to the block immediately following the test, reverse the sense of the
test, and exit with an error code if the allocation fails. This eliminates
descending into an if block if the allocation is successful. Move all
lines inside the removed block one tab to the left, and join lines
that will fall under the 80 char limit.

Signed-off-by: Kelley Nielsen <kelleynnn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 07:55:00 -08:00
Kelley Nielsen
9a1261f317 staging: ft1000: fix checkpatch issues in ft1000_poll()
The function ft1000_poll(), in ft1000_hw.c, has many miscellaneous
coding style issues, such as improper indentation, C99 comments, use of
msleep(), and lines over 80 characters. Changes all spaces at the start
of lines to the proper number of tabs. Convert C99 comments to standard
/* */ style. Change calls to msleep(10) to usleep_range(9000, 11000).
Break lines over 80 characters, unless they are user visible strings.
Remove space before open paren in function calls. Fix any other issues
that checkpatch finds.

Signed-off-by: Kelley Nielsen <kelleynnn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 07:55:00 -08:00
Kelley Nielsen
f3802bdb15 staging: ft1000: flatten nesting in handle_misc_portid
The newly extracted function handle_misc_portid still has several
unnecessary levels of nesting, having inherited its logic from the
original extracted lines. Move handling for failed memory allocation
(of *pdpram_blk) to the top of the function, and return -1 from within
it. This eliminates the if statement around the body of the function.
Change two levels of nested if/else to an if/else-if/else. Create a
label, exit_failure, at the end of the function with the cleanup code,
and goto it at all points of failure. Also, goto it if the call to
ft1000_receive_cmd() fails, instead of descending into an if block if
it succeeds. Pull all lines from inside the former if blocks to the
left, and rejoin lines to take advantage of reclaimed horizontal space.

Signed-off-by: Kelley Nielsen <kelleynnn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 07:55:00 -08:00
Kelley Nielsen
8a58cad260 staging: ft1000: extract helper handle_misc_portid()
The function ft1000_poll, in ft1000_hw.c, is complex, with deep levels
of nesting, unnecessary variables, and style issues. Extract the default
case of the switch statement to its own function, handle_misc_portid.
Make the variable struct dpram_blk *pdpram_blk local to the new function
and remove it from the old. The variable struct pseudo_hdr *ppseudo_hdr is
used only once, to access a member of another struct, so eliminate it
and access the member directly. Return -1 in all the places where the
code fails, and 0 on successful completion. Fix coding style errors.

Signed-off-by: Kelley Nielsen <kelleynnn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 07:55:00 -08:00
Kelley Nielsen
6eca0c1fa2 staging: ft1000: extract dsp_broadcast_msg_id()
The function ft1000_poll, in ft1000_hw.c, is overly complex, with at
least five levels of nesting. Extract the lines in switch case
DSPBCMSGID into their own function, called dsp_broadcast_msg_id(). Pass
one parameter, struct ft1000_usb *dev. Make a copy of struct dpram_blk
*pdpram_blk local to the new function, since it is initialized at the
top of each case in which it appears. Make unsigned long flags local to
the new function. Remove the assignment to struct pseudo_hdr
*ppseudo_hdr, which is otherwise unused in the switch case, and receives
the same assignment at the top of each case in which it appears. Return
an int, 0 for success and -1 for error. Correct style issues in the
extracted lines.

Signed-off-by: Kelley Nielsen <kelleynnn@gmail.com>
Reviewed-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 07:53:48 -08:00
Kelley Nielsen
d5ae3c482d staging: ft1000: remove unused variable nxtph
The function ft1000_poll, in ft1000_hw.c, is overly complex, with at
least five different levels of nesting. While preparing to extract one
of the cases to its own function, I discovered that the variable nxtph
is not used. It is declared and assigned a value in ft1000_poll(), then
passed by reference to the helper function ft1000_receive_command(),
which receives it as parameter. pnxtph does not appear in the body of
this function. Remove all occurrences of nxtph and pnxtph.

Signed-off-by: Kelley Nielsen <kelleynnn@gmail.com>
Reviewed-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 07:53:48 -08:00
Kelley Nielsen
46d981557b staging: ft1000: STATUS defines completely removed
The ft1000 driver ignores the normal Linux error codes, using its
own macros, STATUS, STATUS_SUCCESS, and STATUS_FAILURE, instead.
Unsigned variables (u16 and u32) are sometimes used to hold them.
This patch converts all occurences of these macros to 0, 0 and -1,
respectively. It also changes the last remaining status variables
(mostly called status and ret) to ints, and removes the declarations
of the macros. This patch does not correct the whitespace issues
in the lines where the changes were made.

Signed-off-by: Kelley Nielsen <kelleynnn@gmail.com>
Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-11-10 07:47:22 -08:00