Lisa Nguyen [Tue, 29 Oct 2013 21:19:50 +0000 (14:19 -0700)]
staging: bcm: Remove unnecessary pointer casting
Some void pointers can be assigned to other
pointer variables in functions without casting.
Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Fabio Estevam [Tue, 29 Oct 2013 21:42:22 +0000 (19:42 -0200)]
imx-drm: ipuv3-crtc: Invert IPU DI0 clock polarity
sig_cfg.clk_pol controls the 'di0_polarity_disp_clk' bit of register
IPUx_DI0_GENERAL through the following code in imx-drm/ipu-v3/ipu-di.c:
if (!sig->clk_pol)
di_gen |= DI_GEN_POLARITY_DISP_CLK;
With 'di0_polarity_disp_clk' bit set we do not have stable HDMI output on
mx6solo: contours of pictures look jittery and the white colour does not appear
really white.
Russell King initially reported this problem at:
http://www.spinics.net/lists/arm-kernel/msg279805.html
Inverting 'di0_polarity_disp_clk' leads to stable HDMI output image.
Tested on the following boards:
- mx6solowandboard (HDMI output)
- mx6qwandboard (HDMI output)
- mx6qsabrelite (LVDS)
- mx6qsabresd (HDMI output and LVDS)
- mx6dlsabresd (HDMI output)
- mx53qsb (parallel WVGA display)
Reported-by: Russell King <rmk+kernel@arm.linux.org.uk>
Suggested-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Larry Finger [Thu, 24 Oct 2013 03:31:37 +0000 (22:31 -0500)]
staging: r8188eu: Fix sparse warnings in rtl_p2p.c
Sparse displays the following:
CHECK drivers/staging/rtl8188eu/core/rtw_p2p.c
drivers/staging/rtl8188eu/core/rtw_p2p.c:162:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_p2p.c:162:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_p2p.c:162:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_p2p.c:221:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_p2p.c:221:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_p2p.c:221:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_p2p.c:292:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_p2p.c:292:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_p2p.c:292:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_p2p.c:371:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_p2p.c:371:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_p2p.c:371:15: got restricted __le16 *<noident>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Larry Finger [Thu, 24 Oct 2013 03:31:36 +0000 (22:31 -0500)]
staging: r8188eu: Fix sparse warnings in rtw_mlme_ext.c
Sparse displays the following:
CHECK drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:1874:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:1874:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:1874:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:2221:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:2221:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:2221:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:2583:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:2583:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:2583:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:2750:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:2750:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:2750:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3002:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3002:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3002:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3197:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3197:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3197:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3311:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3311:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3311:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3563:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3563:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3563:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:4522:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:4522:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:4522:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:4750:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:4750:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:4750:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:4906:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:4906:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:4906:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5040:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5040:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5040:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5184:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5184:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5184:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5322:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5322:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5322:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5654:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5654:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5654:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5769:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5769:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5769:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5894:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5894:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5894:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5996:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5996:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5996:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:6066:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:6066:15: expected unsigned short [usertype] *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:6066:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:6200:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:6200:15: expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:6200:15: got restricted __le16 *<noident>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Larry Finger [Thu, 24 Oct 2013 03:31:35 +0000 (22:31 -0500)]
staging: r8188eu: Fix sparse warnings in rtl8188e.cmd.c
Sparse displays the following:
CHECK drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c:285:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c:285:15: expected unsigned short [usertype] *fctrl
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c:285:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c:368:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c:368:15: expected unsigned short [usertype] *fctrl
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c:368:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c:403:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c:403:15: expected unsigned short [usertype] *fctrl
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c:403:15: got restricted __le16 *<noident>
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c:465:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c:465:15: expected unsigned short [usertype] *fctrl
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c:465:15: got restricted __le16 *<noident>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Larry Finger [Thu, 24 Oct 2013 03:31:34 +0000 (22:31 -0500)]
staging: r8188eu: Fix sparse warnings in rtw_ieee80211.c
Sparse reports the following:
CHECK drivers/staging/rtl8188eu/core/rtw_ieee80211.c
drivers/staging/rtl8188eu/core/rtw_ieee80211.c:1593:14: warning: cast to restricted __le16
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ian Abbott [Mon, 21 Oct 2013 09:10:39 +0000 (10:10 +0100)]
staging: comedi: s626: replace S626_MULT_X? values
Replace the use of the `S626_MULT_X1`, `S626_MULT_X2` and `S626_MULT_X4`
clock multiplier values with the equivalent `S626_CLKMULT_1X`,
`S626_CLKMULT_2X` and `S626_CLKMULT_4X` values to avoid duplication.
Replace the use of `S626_MULT_X0` with a new macro
`S626_CLKMULT_SPECIAL` (this is treated specially by the
'ClkMultA'/'ClkMultB' field of the 'CRA'/'CRB' register). Remove the
now unused `S626_MULT_X?` macros.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ian Abbott [Mon, 21 Oct 2013 09:10:38 +0000 (10:10 +0100)]
staging: comedi: s626: remove S626_BF_* macros
The `S626_BF_*` bitfield position macros are no longer used and are just
a subset of the corresponding `S626_STDBIT_*` bitfield position macros.
Remove them.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ian Abbott [Mon, 21 Oct 2013 09:10:37 +0000 (10:10 +0100)]
staging: comedi: s626: expand standardized IndxSrc values
The 'IndxSrc' value for the standardized encoder setup is currently 1
bit wide and takes one of the following values:
S626_INDXSRC_HARD = 0 // index source from hardware encoder
S626_INDXSRC_SOFT = 1 // index source software controlled by IndxPol
However the hardware 'IndxSrcA' and 'IndxSrcB' values for the 'A' and
'B' counters are 2 bits wide. The above standardized values 0 and 1
correspond to the hardware values 0 and 2.
In order to simplify conversions between the standardized values and
hardware values, expand the range of standardized values to cover all
four possible values. The new values are as follows:
S626_INDXSRC_ENCODER = 0 // index source from hardware encoder
S626_INDXSRC_DIGIN = 1 // index source from digital inputs
S626_INDXSRC_SOFT = 2 // index source s/w controlled by IndxPol
S626_INDXSRC_DISABLED = 2 // index source disabled
(Note the change in value for `S626_INDXSRC_SOFT` and the replacement of
`S626_INDXSRC_HARD` with `S626_INDXSRC_ENCODER` for consistency with the
`CntSrc` values.)
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ian Abbott [Mon, 21 Oct 2013 09:10:36 +0000 (10:10 +0100)]
staging: comedi: s626: make CRA and CRB setup conversions more readable
Use the new macros defined in "s626.h" for constructing and decomposing
'CRA', 'CRB' and standardized encoder setup values to make the
conversions between standardized encoder setup values, and CRA/CRB
register values easier to follow.
There is some messing about with the 'IndxSrc' values which are 1-bit
wide in the standardized encoder setup, and 2-bit wide in the 'CRA' and
'CRB' register values. This will be addressed by a later patch.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Wei Yongjun [Fri, 25 Oct 2013 09:07:18 +0000 (17:07 +0800)]
staging: drm/imx: fix return value check in imx_drm_init()
In case of error, the function platform_device_register_simple() returns
ERR_PTR() and never returns NULL. The NULL test in the return value check
should be replaced with IS_ERR().
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ian Abbott [Mon, 21 Oct 2013 09:42:37 +0000 (10:42 +0100)]
staging: comedi: adl_pci9118: fix a misaligned comment
As pointed out by Hartley Sweeten, one of my recent patches resulted in
the start of a multi-line comment ending up misaligned. Fix it.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Larry Finger [Tue, 22 Oct 2013 03:15:05 +0000 (22:15 -0500)]
staging: r8188eu: Set device type to wlan
The latest version of NetworkManager does not recognize the device as wireless
without this change.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@vger.kernel.org> # [3.12+]
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Joe Perches [Wed, 23 Oct 2013 19:14:53 +0000 (12:14 -0700)]
staging: Remove OOM message after input_allocate_device
Emitting an OOM message isn't necessary after input_allocate_device
as there's a generic OOM and a dump_stack already done.
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Luka Perkov [Tue, 29 Oct 2013 01:24:34 +0000 (02:24 +0100)]
staging: octeon: drop redundant mac address check
Checking if MAC address is valid using is_valid_ether_addr() is already done in
of_get_mac_address().
Signed-off-by: Luka Perkov <luka@openwrt.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Kevin McKinney [Tue, 29 Oct 2013 03:51:38 +0000 (23:51 -0400)]
Staging: bcm: Fix WARNING: space prohibited before semicolon.
This patch removes a space before semicolon as
specified by checkpatch.pl.
Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Chuong Ngo [Wed, 23 Oct 2013 19:11:20 +0000 (15:11 -0400)]
drivers: staging: bcm: Removed a developer debug statement.
Removed a developer debug statement per the TODO list. Additionally,
removed braces for the if-statement to match coding style.
Signed-off-by: Chuong Ngo <cngo.github@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Himangi Saraogi [Tue, 29 Oct 2013 00:58:03 +0000 (06:28 +0530)]
Stging: bcm: Adapter.h : removed typedef from struct _U_IP_ADDRESS and changed it to lowercase
Running checkpatch.pl on the file drivers/staging/bcm/Adapter.h gave
an error as it is a mistake to use typedef for structures
according to CodeingStyle as it reduces readability. The typedef was
removed and all occurrences of the typedef union were replaced with
union u_ip_address as types are all lowercase.
Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ebru Akagunduz [Tue, 29 Oct 2013 08:14:34 +0000 (10:14 +0200)]
Staging: winbond: Fix Sparse Warnings in reg.c
This patch fixes the Sparse Warnings "symbol was
not declared. Should it be static?" and "defined
but not used [-Wunused-variable]"
in reg.c
Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ebru Akagunduz [Tue, 29 Oct 2013 08:08:46 +0000 (10:08 +0200)]
Staging: winbond: Fix Sparse Warnings in phy_calibration.c
This patch fixes Sparse Warnings "symbol was not
declared. Should it be static?" and "defined
but not used [-Wunused-function]" in
phy_calibration.c
Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Teodora Baluta [Mon, 28 Oct 2013 22:09:18 +0000 (00:09 +0200)]
staging: comedi: use memdup_user to simplify code
Use memdup_user rather than duplicating implementation. Fix following
coccinelle warnings:
drivers/staging/comedi/comedi_fops.c:1425:5-12: WARNING opportunity for memdup_user
drivers/staging/comedi/comedi_fops.c:1553:6-13: WARNING opportunity for memdup_user
Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Kelley Nielsen [Tue, 29 Oct 2013 15:08:06 +0000 (08:08 -0700)]
staging: ft1000: status variables changed to int in ft1000_download.c
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 <kelleynnn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Kelley Nielsen [Tue, 29 Oct 2013 15:07:40 +0000 (08:07 -0700)]
staging: ft1000: style issues fixed in write_blk
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 <kelleynnn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Kelley Nielsen [Tue, 29 Oct 2013 15:06:56 +0000 (08:06 -0700)]
staging: ft1000: function write_dpram32_and_check extracted from write_blk
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 <kelleynnn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Kelley Nielsen [Tue, 29 Oct 2013 15:05:23 +0000 (08:05 -0700)]
staging: ft1000: duplicate code replaced with call to request_code_segment
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 <kelleynnn@gmail.com>
Reviewed-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Kelley Nielsen [Tue, 29 Oct 2013 15:01:50 +0000 (08:01 -0700)]
staging: ft1000: function request_code_segment extracted
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 <kelleynnn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Kelley Nielsen [Sun, 27 Oct 2013 23:40:39 +0000 (16:40 -0700)]
staging: ft1000: function scram_start_dwnld extracted from scram_dnldr in ft1000_download.c
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 <kelleynnn@gmail.com>
Reviewed-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Rashika Kheria [Sun, 27 Oct 2013 14:23:36 +0000 (19:53 +0530)]
Staging: ft1000: Fix assignment of bool to 0/1 in ft1000_dnld.c
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 <rashika.kheria@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Rashika Kheria [Sun, 27 Oct 2013 14:22:51 +0000 (19:52 +0530)]
Staging: ft1000: Fix comparsion of bool to 0/1 in ft1000_hw.c
This patch fixes the following coccinelle warning in ft1000-usb/ft1000_hw.c -
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c:1924:9-25: WARNING: Comparison of bool to 0/1
Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Rashika Kheria [Sun, 27 Oct 2013 14:21:59 +0000 (19:51 +0530)]
Staging: ft1000: Fix assignment of bool to 0/1 in ft1000_hw.c
This patch fixes the following coccinelle warning in ft1000-usb/ft1000_hw.c-
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c:1444:1-19: WARNING: Assignment of bool to 0/1
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c:1937:16-34: WARNING: Assignment of bool to 0/1
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c:1938:16-35: WARNING: Assignment of bool to 0/1
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c:1570:4-22: WARNING: Assignment of bool to 0/1
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c:1575:4-22: WARNING: Assignment of bool to 0/1
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c:636:1-26: WARNING: Assignment of bool to 0/1
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c:638:1-25: WARNING: Assignment of bool to 0/1
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c:669:1-26: WARNING: Assignment of bool to 0/1
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c:755:1-23: WARNING: Assignment of bool to 0/1
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c:756:1-26: WARNING: Assignment of bool to 0/1
Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Rashika Kheria [Sun, 27 Oct 2013 14:20:45 +0000 (19:50 +0530)]
Staging: ft1000: Fix assignment of bool to non-0/1 constant in ft1000_download.c
This patch fixes the following coccinelle error in ft1000-usb/ft1000_download.c -
drivers/staging/ft1000/ft1000-usb/ft1000_download.c:615:1-16: ERROR: Assignment of bool to non-0/1 constant
drivers/staging/ft1000/ft1000-usb/ft1000_download.c:926:5-20: ERROR: Assignment of bool to non-0/1 constant
drivers/staging/ft1000/ft1000-usb/ft1000_download.c:943:7-22: ERROR: Assignment of bool to non-0/1 constant
Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Rashika Kheria [Sun, 27 Oct 2013 14:19:38 +0000 (19:49 +0530)]
Staging: ft1000: Fix assignment of bool to non-0/1 constant in ft1000_usb.c
This patch fixes the following coccinelle error in ft1000-usb/ft1000_usb.c-
drivers/staging/ft1000/ft1000-usb/ft1000_usb.c:50:4-18: ERROR: Assignment of bool to non-0/1 constant
drivers/staging/ft1000/ft1000-usb/ft1000_usb.c:174:1-15: ERROR: Assignment of bool to non-0/1 constant
drivers/staging/ft1000/ft1000-usb/ft1000_usb.c:39:12-26: ERROR: Assignment of bool to non-0/1 constant
Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Rashika Kheria [Sat, 26 Oct 2013 17:42:19 +0000 (23:12 +0530)]
Staging: dwc2: Fix return error value in dwc2_driver_probe()
This patch fixes the following smatch warning in platform.c-
drivers/staging/dwc2/platform.c:109 dwc2_driver_probe() info: why not propagate 'irq' from platform_get_irq() instead of (-22)?
Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Rashika Kheria [Sat, 26 Oct 2013 17:41:22 +0000 (23:11 +0530)]
Staging: dwc2: Fix conditional statement since urb->actual_length is never less than zero.
This patch fixes the following smatch warning in hcd.c:
drivers/staging/dwc2/hcd.c:787 dwc2_assign_and_init_hc() warn: unsigned 'urb->actual_length' is never less than zero.
Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Rashika Kheria [Sat, 26 Oct 2013 12:29:50 +0000 (17:59 +0530)]
Staging: sbe-2t3e3: Fix smatch warning of function definition with external linkage
This patch fixes the following smatch warning in cpld.c-
drivers/staging/sbe-2t3e3/cpld.c:243:13: warning: function 'cpld_set_clock' with external linkage has definition
Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Teodora Baluta [Sat, 26 Oct 2013 06:18:22 +0000 (09:18 +0300)]
staging: rtl8192e: use memdup_user to simplify code
Use memdup_user rather than duplicating its implementation. This patch
fixes the following coccinelle warnings:
drivers/staging/rtl8192e/rtl8192e/rtl_core.c:2598:8-15: WARNING opportunity for memdup_user
drivers/staging/rtl8192e/rtllib_softmac.c:3594:9-16: WARNING opportunity for memdup_user
Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Teodora Baluta [Fri, 25 Oct 2013 09:00:19 +0000 (12:00 +0300)]
staging: rtl8187se: delete duplicated argument to |
This patch fixes the following coccinelle issue for a mask calculation:
drivers/staging/rtl8187se/r8180_core.c:2552:44-54: duplicated argument to & or |
Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Reviewed-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Teodora Baluta [Fri, 25 Oct 2013 09:00:17 +0000 (12:00 +0300)]
staging: rtl8187se: fix code allignment
Fix confusingly indented code after if. This patch fixes the following
coccinelle issues:
drivers/staging/rtl8187se/r8180_wx.c:1148:2-11: code aligned with following code on line 1150
drivers/staging/rtl8187se/r8180_dm.c:668:1-84: code aligned with following code on line 674
drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c:623:2-38: code aligned with following code on line 625
drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c:148:1-85: code aligned with following code on line 149
Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Reviewed-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Teodora Baluta [Fri, 25 Oct 2013 09:00:16 +0000 (12:00 +0300)]
staging: rtl8187se: bool tests don't need comparisons
This patch fixes the following coccinelle warning:
drivers/staging/rtl8187se/r8180_core.c:2217:5-40: WARNING: Comparison to bool
Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Reviewed-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Teodora Baluta [Fri, 25 Oct 2013 09:00:15 +0000 (12:00 +0300)]
staging: rtl8187se: fix assignment of bool to 0/1
This patch fixes the following coccinelle warnings:
drivers/staging/rtl8187se/r8180_core.c:2433:1-20: WARNING: Assignment of bool to 0/1
drivers/staging/rtl8187se/r8180_core.c:2275:3-34: WARNING: Assignment of bool to 0/1
Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Reviewed-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Teodora Baluta [Fri, 25 Oct 2013 09:00:14 +0000 (12:00 +0300)]
staging: rtl8187se: use memdup_user to simplify code
This patch fixes the following coccinelle warning to use memdup_user
rather than duplicating its implementation:
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c:2947:9-16: WARNING opportunity for memdup_user
Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Valentina Manea [Fri, 25 Oct 2013 08:48:29 +0000 (11:48 +0300)]
staging: sep: do not use comparisons on bool tests
This patch fixes coccinelle errors regarding comparisons
used in bool tests.
Signed-off-by: Valentina Manea <valentina.manea.m@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Valentina Manea [Fri, 25 Oct 2013 08:28:10 +0000 (11:28 +0300)]
staging: rtl8192e: do not use comparisons on bool tests
This patch fixes coccinelle errors regarding comparisons
used in bool tests.
Signed-off-by: Valentina Manea <valentina.manea.m@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Teodora Baluta [Fri, 25 Oct 2013 08:27:09 +0000 (11:27 +0300)]
staging: rtl8192u: use memdup_user to simplify code
Use memdup_user rather than duplicating its implementation. Fix the
following coccinelle warnings:
drivers/staging/rtl8192u/r8192U_core.c:3792:7-14: WARNING opportunity for memdup_user
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c:3153:9-16: WARNING opportunity for memdup_user
Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Valentina Manea [Fri, 25 Oct 2013 08:39:56 +0000 (11:39 +0300)]
staging: rtl8188eu: do not use comparisons on bool tests
This patch fixes coccinelle errors regarding comparisons
used in bool tests.
Signed-off-by: Valentina Manea <valentina.manea.m@gmail.com>
Reviewed-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Valentina Manea [Fri, 25 Oct 2013 08:52:20 +0000 (11:52 +0300)]
staging: imx-drm: use true and false for bool variables
This patch fixes coccinelle errors for bool variables
initialized with 1 or 0 instead of true and false.
Signed-off-by: Valentina Manea <valentina.manea.m@gmail.com>
Reviewed-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Rashika Kheria [Thu, 24 Oct 2013 10:54:51 +0000 (16:24 +0530)]
Staging: et131x: Fix Smatch Warning of Buffer Overflow
This patch fixes the following Sparse Warning in et131x.c-
drivers/staging/et131x/et131x.c:2957 nic_send_packet() error: buffer overflow 'frags' 17 <= 21
drivers/staging/et131x/et131x.c:2959 nic_send_packet() warn: buffer overflow 'frags' 17 <= 21
drivers/staging/et131x/et131x.c:2961 nic_send_packet() error: buffer overflow 'frags' 17 <= 21
Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ebru Akagunduz [Thu, 24 Oct 2013 12:09:49 +0000 (15:09 +0300)]
Staging: rtl8187se: fix line over 80 characters in r8185b_init.c
Fix checkpatch.pl issues with line over 80 characters
in r8185b_init.c, Italian to English translated added
Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Teodora Baluta [Mon, 21 Oct 2013 23:37:24 +0000 (02:37 +0300)]
staging: rtl8187se: use netdev_warn instead of printk
This patch fixes this type of checkpatch warnings:
WARNING: Prefer netdev_warn(netdev, ... then dev_warn(dev, ... then
pr_warn(... to printk(KERN_WARNING ...
Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Teodora Baluta [Mon, 21 Oct 2013 23:37:23 +0000 (02:37 +0300)]
staging: rtl8187se: use netdev_info instead of printk
WARNING: Prefer netdev_info(netdev, ... then dev_info(dev, ... then
pr_info(... to printk(KERN_INFO
Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Teodora Baluta [Mon, 21 Oct 2013 23:37:22 +0000 (02:37 +0300)]
staging: rtl8187se: prefer netdev_dbg to printk
This patch fixes the following checkpatch warning:
WARNING: Prefer netdev_dbg(netdev, ... then dev_dbg(dev, ... then
pr_debug(... to printk(KERN_DEBUG ...
Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Teodora Baluta [Mon, 21 Oct 2013 23:37:21 +0000 (02:37 +0300)]
staging: rtl8187se: fix lines over 80 characters
This patch fixes lines that are well over 80 characters long and
silences the checkpatch warning.
Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Teodora Baluta [Mon, 21 Oct 2013 23:37:20 +0000 (02:37 +0300)]
staging: rtl8187se: fixup multi-line comment
This patch ensures that all multi-line comments are consistent with the Linux
kernel coding style for long (multi-line) comments.
Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Teodora Baluta [Mon, 21 Oct 2013 23:37:19 +0000 (02:37 +0300)]
staging: rtl8187se: remove an unnecessary line continuation
This patch fixed the following checkpatch warning:
WARNING: Avoid unnecessary line continuations
Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Teodora Baluta [Mon, 21 Oct 2013 23:37:18 +0000 (02:37 +0300)]
staging: rtl8187se: fix conditional statement indent
This patch fixes the following checkpatch warning:
WARNING: suspect code indent for conditional statements (24, 26)
Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Teodora Baluta [Mon, 21 Oct 2013 23:37:17 +0000 (02:37 +0300)]
staging: rtl8187se: else should follow close brace '}
This patch fixes the following checkpatch warning:
ERROR: else should follow close brace '}'
Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Teodora Baluta [Mon, 21 Oct 2013 23:37:16 +0000 (02:37 +0300)]
staging: rtl8187se: fix comments over 80 characters
This patch rearranges comments that are over 80 characters.
Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Teodora Baluta [Mon, 21 Oct 2013 23:37:15 +0000 (02:37 +0300)]
staging: rtl8187se: open brace following function declarations go on the next line
This patch fixes the following checkpatch error:
staging/rtl8187se/ieee80211/ieee80211_tx.c:232:
ERROR: open brace '{' following function declarations go on the next
line
Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Teodora Baluta [Mon, 21 Oct 2013 23:37:14 +0000 (02:37 +0300)]
staging: rtl8187se: fix checkpatch space and tab warnings
This patch fixes checkpatch issues regarding space and tab like:
WARNING: please, no spaces at the start of a line
ERROR: code indent should use tabs where possible
WARNING: suspect code indent for conditional statements (2, 4)
ERROR: space required before the open parenthesis '('
ERROR: space required after that ',' (ctx:VxO)
Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Lisa Nguyen [Mon, 28 Oct 2013 08:36:19 +0000 (01:36 -0700)]
staging: bcm: Replace FALSE with false
Replace user-defined type FALSE with C defined false keyword.
Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Lisa Nguyen [Mon, 28 Oct 2013 08:35:59 +0000 (01:35 -0700)]
staging: bcm: Replace BOOLEAN with bool
Remove user-defined BOOLEAN data type with C bool data
type.
Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Teodora Baluta [Mon, 21 Oct 2013 23:37:13 +0000 (02:37 +0300)]
staging: rtl8187se: use C89 comment style instead of C99-style
This patch fixes the comments in file ieee80211/ieee80211_tx.c from
driver rtl8187se, as reported by checkpatch. The C89 comments that
contain code
are deleted.
Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Teodora Baluta [Mon, 21 Oct 2013 23:37:12 +0000 (02:37 +0300)]
staging: rtl8187se: (foo*) should be (foo *)
Fix checkpatch error:
ERROR: "(foo*)" should be "(foo *)"
Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Lisa Nguyen [Mon, 28 Oct 2013 06:36:20 +0000 (23:36 -0700)]
staging: sb105x: Remove unneeded semicolon in sb_pci_mp.c
Remove unneeded semicolon in sb_pci_mp.c to meet kernel
coding style.
Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ebru Akagunduz [Tue, 22 Oct 2013 23:00:22 +0000 (02:00 +0300)]
Staging:line6: fix line over 80 characters
Fix checkpatch.pl issues with line over 80 characters
in playback.c
Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Archana kumari [Wed, 23 Oct 2013 14:43:42 +0000 (20:13 +0530)]
staging: rts5139: Replaced min() with min_t() in
This patch replaces min() with min_t() in rts51x_scsi.c
Signed-off-by: Archana kumari <archanakumari959@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Rashika Kheria [Sat, 26 Oct 2013 11:45:21 +0000 (17:15 +0530)]
Staging: line6: Fix Sparse Warning of incorrect type
This patch fixes the following sparse warnings in toneport.c-
drivers/staging/line6/toneport.c:329:48: warning: incorrect type in argument 1 (different base types)
drivers/staging/line6/toneport.c:329:48: expected short [signed] product
drivers/staging/line6/toneport.c:329:48: got restricted __le16 [usertype] idProduct
drivers/staging/line6/toneport.c:385:48: warning: incorrect type in argument 1 (different base types)
drivers/staging/line6/toneport.c:385:48: expected short [signed] product
drivers/staging/line6/toneport.c:385:48: got restricted __le16 [usertype] idProduct
drivers/staging/line6/toneport.c:438:64: warning: incorrect type in argument 1 (different base types)
drivers/staging/line6/toneport.c:438:64: expected short [signed] product
drivers/staging/line6/toneport.c:438:64: got restricted __le16 [usertype] idProduct
Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Rashika Kheria [Sat, 26 Oct 2013 11:43:54 +0000 (17:13 +0530)]
Staging: line6: Fix Sparse Warning of restricted __le16 degrades to integer
This patch fixes the following sparse warning in toneport.c-
warning: restricted __le16 degrades to integer
Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Rashika Kheria [Sat, 26 Oct 2013 11:42:57 +0000 (17:12 +0530)]
Staging: line6: Fix Sparse warning of restricted __le16 degrades to integer
This patch fixes the following sparse warning in driver.c-
warning: restricted __le16 degrades to integer
Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Nandini Hanumanthagowda [Sun, 27 Oct 2013 18:07:15 +0000 (23:37 +0530)]
staging: vt6656: removed space after '*' in pointer declaration
space after '*' in pointer declaration is not preferred in linux
and results in checkpatch error. Hence removed the spaces present
after the '*' in pointer declarations to fix the checkpatch errors
Signed-off-by: Nandini Hanumanthagowda <nandu.hgowda@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johannes Löthberg [Sun, 27 Oct 2013 21:02:09 +0000 (22:02 +0100)]
Staging: vt6656: fix code indenting error in power.c
This patch fixes a code indentation error found by checkpatch.pl
where a line was indented with spaces instead of tabs
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ebru Akagunduz [Sun, 27 Oct 2013 22:58:02 +0000 (00:58 +0200)]
Staging: vt6656: Fix Sparse Warning: cast from restricted gfp_t in hostap.c
This patch fixes the following type of sparse warnings:
drivers/staging/vt6656/hostap.c:688:42: warning: cast from restricted gfp_t
drivers/staging/vt6656/hostap.c:688:42: warning: incorrect type in argument 2 (different base types)
drivers/staging/vt6656/hostap.c:688:42: expected restricted gfp_t [usertype] flags
drivers/staging/vt6656/hostap.c:688:42: got int [signed] <noident>
Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Lisa Nguyen [Mon, 28 Oct 2013 00:55:05 +0000 (17:55 -0700)]
staging: lustre: lnet: Rewrite return statement in socklnd.c
Rewrite the return statement in socklnd.c to eliminate the
use of a ternary operator. This will prevent the checkpatch.pl
script from generating a warning saying to remove () from
this particular return statement.
Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Teodora Baluta [Tue, 22 Oct 2013 22:15:26 +0000 (01:15 +0300)]
staging: gdm724x: kzalloc should be used instead of kmalloc/memset
This patch fixes the following coccinelle warnings in driver gdm724x:
drivers/staging/gdm724x/gdm_usb.c:127:9-16: WARNING: kzalloc should be used for t_sdu, instead of kmalloc/memset
drivers/staging/gdm724x/gdm_usb.c:91:5-12: WARNING: kzalloc should be used for t, instead of kmalloc/memset
Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Reviewed-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Valentina Manea [Wed, 23 Oct 2013 07:29:55 +0000 (10:29 +0300)]
staging: drm/imx: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO
This patch fixes coccinelle error regarding usage of IS_ERR and
PTR_ERR instead of PTR_ERR_OR_ZERO.
Signed-off-by: Valentina Manea <valentina.manea.m@gmail.com>
Reviewed-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Greg Kroah-Hartman [Sun, 27 Oct 2013 21:05:02 +0000 (14:05 -0700)]
staging: ktap: remove code from tree
ktap should be merged through the "proper" place in the kernel tree, in
the perf tool, not as a stand-alone kernel module in staging. So remove
it from here for now so that it can be merged correctly later.
Reported-by: Ingo Molnar <mingo@kernel.org>
Cc: Jovi Zhangwei <jovi.zhangwei@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Greg Kroah-Hartman [Sun, 27 Oct 2013 21:02:54 +0000 (14:02 -0700)]
Merge tag 'iio-for-3.13e' of git://git./linux/kernel/git/jic23/iio into staging-next
Jonathan writes:
Fifth round of IIO new drivers, cleanups and functionality for the 3.13 cycle.
New Driver
* Freescale mag3110 magnetometer driver.
New functionality
* Add LPS001WP support to the ST pressure driver.
* Allow the max1363 driver to use only smbus functions for 8 bit devices. This
allows the driver to be used when more extensive i2c support is not
available.
Cleanups
* Fix incorrect description of unit conversions in ak8975.
* Switch to pr_err in industrialio-core.c instead of direct printk calls.
* Some simple redundant error handling removal patches.
* Trivial warning suppression by adding brackets to a sizeof call.
* Drop redundant of_match_ptr casts in drivers that are dependent on
OF supporting being present. The only purpose of the of_match_ptr
wrapper was to make stubbing out of the relevant structures trivial.
Fixes
* Make MXS_LRADC depend on INPUT to avoid compile failures. This fixes an
issue introduced in the previous pull in this cycle.
Chen Gang [Thu, 24 Oct 2013 01:55:17 +0000 (09:55 +0800)]
drivers: staging: rtl8188eu: use 'ccflags-y' instead of EXTRA_CFLAGS in Makefile
If command line use EXTRA_CFLAGS (e.g. "EXTRA_CFLAGS=-mmedium-calls"
for arc architecture, with allmodconfig), it can not pass compiling,
the related error:
drivers/staging/rtl8188eu/core/rtw_ap.c:22:27: fatal error: osdep_service.h: No such file or directory
Signed-off-by: Chen Gang <gang.chen@asianux.com>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ashvini Varatharaj [Tue, 22 Oct 2013 10:34:48 +0000 (16:04 +0530)]
Staging: winbond: removing unused variables thread_count and link_name[]
Removing the variable thread_count and link_name[WB_MAX_LINK_NAME_LEN] array
since they are not used elsewhere in the driver
Signed-off-by: Ashvini Varatharaj <ashvinivaratharaj@gmail.com>
Reviewed-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ashvini Varatharaj [Mon, 21 Oct 2013 13:57:30 +0000 (19:27 +0530)]
Staging: winbond: removing CamelCase in core.h
Fixing TODO item: fix severeCamelCaseInfestation
Signed-off-by: Ashvini Varatharaj <ashvinivaratharaj@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Rashika Kheria [Thu, 24 Oct 2013 11:26:27 +0000 (16:56 +0530)]
Staging: slicoss: Replace seq_printf with seq_puts
This patch fixes the following checkpatch.pl warning in slicoss.c:
WARNING: Prefer seq_puts to seq_printf
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>
Ebru Akagunduz [Mon, 21 Oct 2013 12:25:27 +0000 (15:25 +0300)]
Staging: iio: fix printk(KERN_ERR .. in lis3l02dq_core.c
Fix checkpatch.pl issues with prefer netdev_err(netdev, .. then
dev_err(dev, .. then pr_err(.. to printk(KERN_ERR
in lis3l02dq_core.c
Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Archana kumari [Thu, 24 Oct 2013 18:29:47 +0000 (23:59 +0530)]
staging: vt6655: fixed use of unnecessary braces in baseband.c
This patch fixes use of unnecessary braces in baseband.c
Signed-off-by: Archana kumari <archanakumari959@gmail.com>
Reviewed-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johannes Löthberg [Thu, 24 Oct 2013 05:26:46 +0000 (07:26 +0200)]
Staging: vt6656: fix a brace coding style issue in power.c
This patch fixes a brace warning in power.c found by checkpatch.pl
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ebru Akagunduz [Wed, 23 Oct 2013 22:34:42 +0000 (01:34 +0300)]
Staging: vt6655: Fix Sparse Warning for Static Declarations in wpa.c
This patch fixes the Sparse Warning "symbol was not declared.
Should it be static?" in wpa.c
Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
Reviewed-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ebru Akagunduz [Wed, 23 Oct 2013 22:42:55 +0000 (01:42 +0300)]
Staging: vt6655: Fix Sparse Warning for Static Declarations in tkip.c
This patch fixes the Sparse Warning "symbol was
not declared. Should it be static?" in tkip.c
Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
Reviewed-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Nandini Hanumanthagowda [Wed, 23 Oct 2013 18:50:12 +0000 (00:20 +0530)]
staging: vt6656: removed braces from single line if-statement
removed braces from if-control flow structs whenever it
contained only one statement to comply with the coding style
Signed-off-by: Nandini Hanumanthagowda <nandu.hgowda@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Nandini Hanumanthagowda [Wed, 23 Oct 2013 18:50:11 +0000 (00:20 +0530)]
staging: vt6656: fixed indentation and unnecessary space errors
Fixed the indentation errors and removed unnecessary space
warnings to comply with coding style
Signed-off-by: Nandini Hanumanthagowda <nandu.hgowda@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Malcolm Priestley [Tue, 22 Oct 2013 19:00:22 +0000 (20:00 +0100)]
staging: vt6656: call usb_device_reset before netdev registration
The USB reset occurs after netdev registration if network manager
calls device_open too fast causing USB fails in main_usb.c: device_init_registers.
Move the usb reset to before register_netdev.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Rashika Kheria [Sun, 27 Oct 2013 13:19:31 +0000 (18:49 +0530)]
Staging: lustre: Fix no use of assignment in if condition
This patch fixes the following checkpatch.pl error in lustre/ldlm/interval_tree.c-
ERROR: do not use assignment in if condition
Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Dulshani Gunawardhana [Sun, 20 Oct 2013 17:28:28 +0000 (22:58 +0530)]
staging:media: Use dev_dbg() instead of pr_debug()
Use dev_dbg() instead of pr_debug() in go7007-usb.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>
Dulshani Gunawardhana [Sun, 20 Oct 2013 17:27:19 +0000 (22:57 +0530)]
staging:media: Use dev_info() instead of pr_info()
Use dev_info instead of pr_info() in go7007-usb.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>
Dulshani Gunawardhana [Sun, 20 Oct 2013 17:26:45 +0000 (22:56 +0530)]
staging: media: Use dev_err() instead of pr_err()
Use dev_err() instead of pr_err() in go7007-usb.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>
Archana kumari [Wed, 23 Oct 2013 19:47:41 +0000 (01:17 +0530)]
staging: media: lirc: Replaced printk macro with dev_info(dev,....) in lirc_imon.c
This patch replaces printk macro with dev_info(dev,....)
in lirc_imon.c
Signed-off-by: Archana kumari <archanakumari959@gmail.com>
Reviewed-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ebru Akagunduz [Thu, 24 Oct 2013 13:30:28 +0000 (16:30 +0300)]
Staging: ft1000: remove unnecessary static function declarations in ft1000_hw.c
This patch removes unnecessary static function
declarations in ft1000_hw.c
Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ebru Akagunduz [Tue, 22 Oct 2013 23:54:33 +0000 (02:54 +0300)]
Staging: ft1000: Fix Sparse Warning for Static Declarations in boot.h
This patch fixes the Sparse Warning: "symbol 'bootimage'
was not declared. Should it be static?" in boot.h
Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
Reviewed-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ebru Akagunduz [Wed, 23 Oct 2013 18:29:22 +0000 (21:29 +0300)]
Staging: ft1000: Fix Sparse Warning for Static Declarations in ft1000_hw.c
This patch fixes the Sparse Warning: "symbol 'ft1000_reset'
was not declared. Should it be static?" in ft1000_hw.c
Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
Reviewed-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Wei Yongjun [Mon, 21 Oct 2013 05:33:50 +0000 (13:33 +0800)]
staging: sep: add missing misc_deregister() on error in sep_register_driver_with_fs()
Add the missing misc_deregister() before return from
sep_register_driver_with_fs() in the error handling case.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Rashika Kheria [Sat, 26 Oct 2013 10:54:43 +0000 (16:24 +0530)]
Staging: lustre: Replace __FUNCTION__ with __func__
This patch fixes the following checkpatch.pl warning in lustre/ldlm/ldlm_request.c-
WARNING: __func__ should be used instead of gcc specific __FUNCTION__
Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Rashika Kheria [Sat, 26 Oct 2013 10:54:02 +0000 (16:24 +0530)]
Staging: lustre: Fix paranthesis not required around return
This patch fixes the following checkpatch.pl warning in lustre/ldlm/ldlm_extent.c-
ERROR: return is not a function, parentheses are not required
Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>