linux.git/drivers/staging/ft1000, branch v3.13

staging: ft1000: fix use of potentially uninitialized variable

2013-11-25T17:25:18+00:00

If boot_case is false, status in never assigned a value.

Signed-off-by: Greg Kroah-Hartman

staging: ft1000: return values corrected in scram_start_dwnld

2013-10-30T00:11:36+00:00

The ft1000 usb driver ignores expected Linux error codes, and uses two
values defined in ft1000_usb.h: STATUS_SUCCESS 0, and STATUS_FAILURE
0x1001; and sometimes -1. This patch changes the return values of the
function scram_start_dwnld to match the status of the handshake returned
by its helper functions, get_handshake and get_handshake_usb. If the
handshake fails, -ENETRESET is returned instead of the inappropriate
STATUS_FAILURE. Also, a new test has been added to differentiate failure
due to timeout from failure due to net reset (the default). -ETIMEDOUT
is returned in this case. Finally, 0 is returned on success instead of
STATUS_SUCCESS.

Signed-off-by: Kelley Nielsen 
Suggested-by: Greg Kroah-Hartman 
Signed-off-by: Greg Kroah-Hartman

staging: ft1000: change values of status return variable in write_dpram32_and_check

2013-10-30T00:10:22+00:00

The ft1000 usb driver ignores expected Linux error codes, and uses two
values defined in ft1000_usb.h: STATUS_SUCCESS 0, and STATUS_FAILURE
0x1001; and sometimes -1. This patch changes the return value of the
function write_dpram_32_and check to 0 or -EREMOTEIO, respectively. The
relevant change was made in the helper function check_buffers (which is
only called from write_dpram32_and_check); it now returns 0 on success
and -EREMOTEIO on failure, and this is allowed to propagate through
write_dpram32_and_check. Assignments to the return variable status that
are no longer needed were removed as well. In one function up the call
chain, dsp_reload in ft1000_hw.c, the status variable was changed from
u16 to int to avoid collecting a signed value in an unsigned variable.

Signed-off-by: Kelley Nielsen 
Suggested-by: Greg Kroah-Hartman 
Signed-off-by: Greg Kroah-Hartman

staging: ft1000: status variables changed to int in ft1000_download.c

2013-10-29T15:36:17+00:00

Linux uses a return type of int for status codes. The file
ft1000_download.c uses a mixture of u16 and u32. This patch changes all
variables called status or Status to ints, whether they are returned
from the function or not. It also changes the return type of all
functions returning one of the variables to correspond. Also, the
declaration of scram_dnldr has been changed in ft1000_usb.h.

Signed-off-by: Kelley Nielsen 
Signed-off-by: Greg Kroah-Hartman

staging: ft1000: style issues fixed in write_blk

2013-10-29T15:36:17+00:00

function write_blk, in ft1000_download.c, contains many coding style
issues. It has indentations of 3 spaces, long lines, C99 comments, and
extra whitespace. It also has a return type of u32, and changing the
returned variable in the function triggers a checkpatch leading spaces
warning. Indentation should be fixed throughout the file for
consistency.

This patch fixes those issues, in preparation for correcting the status
return type throughout the file. The variable Status has been changed
from u32 to int and renamed status.

Signed-off-by: Kelley Nielsen 
Signed-off-by: Greg Kroah-Hartman

staging: ft1000: function write_dpram32_and_check extracted from write_blk

2013-10-29T15:36:17+00:00

function write_blk is long and overly complex, consisting of a triply
nested loop. It also has improper indentation and line lengths
throughout, and has return type of u32 rather than int. Some of the
lines, when converted to proper indentation, create checkpatch warnings
for too many leading tabs.

This patch extracts the innermost loop into its own function,
write_dpram32_and_check. This removes several levels of indentation from
the extracted lines and makes the original function simpler. Two local
variables from the original function, u16 resultbuffer[] and a loop
counter, have been made local variables of the new function. Two calls
to msleep() have been replaced with usleep_range() as per Documentation/
timers/timers-howto.txt (which was referred to in a checkpatch warning).
Several other style issues in the extracted code have been corrected as
well.

Signed-off-by: Kelley Nielsen 
Signed-off-by: Greg Kroah-Hartman

staging: ft1000: duplicate code replaced with call to request_code_segment

2013-10-29T15:36:16+00:00

function scram_dnldr, in ft1000_download.c, is very long and consists
mainly of nested switch statements inside a while loop. Some code in one
of the inner switch cases was almost identical to the code in the
previously extracted function request_code_segment. The duplicated code
was replaced with a call to request_code_segment, and
request_code_segment was slightly modified to work in both cases.

A new parameter was added to request_code_segment, a bool to distinguish
which case it was replacing. The name of an existing parameter (now
called endpoint) was changed to reflect the fact that it will be passed
in from more than one place. Several lines from the case containing the
duplicated code were moved to request_code_segment, and a test was added
to determine if these lines or a line from the original function should
be run.

Finally, an unused variable (tempword) was removed from scram_dnldr.

Signed-off-by: Kelley Nielsen 
Reviewed-by: Peter P Waskiewicz Jr 
Signed-off-by: Greg Kroah-Hartman

staging: ft1000: function request_code_segment extracted

2013-10-29T15:36:16+00:00

function scram_dnldr in ft1000_download.c is very long and contains many
coding style errors and best practice violations. It consists of nested
switch statements inside a while loop. One of the inner switch cases has
been extracted as a helper function. Also, some style errors (such as
C99 comments) have been fixed, an assignment to an unread variable has
been removed, and break statements inside ifs have been converted to
returns.

Signed-off-by: Kelley Nielsen 
Signed-off-by: Greg Kroah-Hartman

staging: ft1000: function scram_start_dwnld extracted from scram_dnldr in ft1000_download.c

2013-10-28T22:04:24+00:00

function scram_dnldr is over 500 lines long, with deep indents that
trigger checkpatch warnings for too many tabs. It mainly consists of a
switch statement with long, complicated cases. The first case has been
extracted to form the helper function scram_start_dwnld. Some style
issues in the extracted lines have been corrected as well.

Signed-off-by: Kelley Nielsen 
Reviewed-by: Peter P Waskiewicz Jr 
Signed-off-by: Greg Kroah-Hartman

Staging: ft1000: Fix assignment of bool to 0/1 in ft1000_dnld.c

2013-10-28T22:00:35+00:00

This patch fixes the following warning in ft1000-pcmcia/ft1000_dnld.c-

drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c:307:6-18: WARNING: Assignment of bool to 0/1

Signed-off-by: Rashika Kheria 
Reviewed-by: Lisa Nguyen 
Signed-off-by: Greg Kroah-Hartman