Commit Graph

375729 Commits

Author SHA1 Message Date
H Hartley Sweeten
7aa41c3c93 staging: comedi: usbduxfast: rename usbduxfastsub_s variables
For aesthetic reasons, globally rename the variables used for the
struct usbduxfastsub_s * in this driver to 'devpriv'. This variable
pointes to the comedi_device private data.

Also, rename the struct to 'usbduxfast_private' to make its use
a bit clearer.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:24:18 -07:00
H Hartley Sweeten
e4a8ecc000 staging: comedi: usbduxfast: rename usb_device variables
For aesthetic reasons, globally rename the variables used for the
struct usb_device * in this driver to simply 'usb'.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:24:18 -07:00
H Hartley Sweeten
a35fd8a17b staging: comedi: usbduxfast: rename usb_interface variables
For aesthetic reasons, globally rename the variables used for the
struct usb_interface * in this driver to simply 'intf'.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:24:18 -07:00
H Hartley Sweeten
ca88c09f0e staging: comedi: usbduxfast: use a local var for the usbduxfastsub_s
Add a local variable to hold the pointer to the place in the
usbduxfast array the is being configured for the device.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:24:17 -07:00
H Hartley Sweeten
64bf88bfd9 staging: comedi: usbduxfast: remove COMEDI_DEBUG noise in usb (*probe)
The COMEDI_DEBUG noise in the usb (*probe) is just added function
trace noise. Remove it along with the final dev_info().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:24:17 -07:00
H Hartley Sweeten
998bb7be46 staging: comedi: usbduxfast: request firmware synchronously
Change the request_firmware_nowait() to a request_firmware() so
that the usb_driver (*probe) and continue with the comedi_driver
(*auto_attach).

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:24:16 -07:00
Sachin Kamat
4e595c0d23 Staging: speakup: Fix return value in synth.c
The function return type is a pointer. Hence return NULL instead
of 0.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:17:30 -07:00
Sachin Kamat
15ab600ce3 Staging: speakup: Fix sparse warning in varhandlers.c
'cp' is a pointer. Fix the incorrect comparison with integer to
avoid the below warning:
drivers/staging/speakup/varhandlers.c:283:19: warning:
Using plain integer as NULL pointer

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:17:29 -07:00
Sachin Kamat
6eb178cebb Staging: speakup: Return NULL instead of 0 in speakup_decpc.c
The function returns a pointer. Hence return NULL instead of 0.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:17:29 -07:00
William Hubbs
667b614118 staging: speakup: remove custom locking macro definitions
Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:14:50 -07:00
William Hubbs
6697330ac5 staging: speakup: synth: remove custom locking macros
Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:14:49 -07:00
William Hubbs
939d84ee09 staging: speakup: thread: remove custom locking macros
Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:14:49 -07:00
William Hubbs
89c9df1b79 staging: speakup: soft: remove custom locking macros
Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:14:48 -07:00
William Hubbs
e6f1838373 staging: speakup: keypc: remove custom locking macros
Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:14:48 -07:00
William Hubbs
62c8c835ed staging: speakup: dtlk: remove custom locking macros
Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:14:47 -07:00
William Hubbs
68743d6b26 staging: speakup: dectlk: remove custom locking macros
Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:14:47 -07:00
William Hubbs
4d888b292a staging: speakup: decpc: remove custom locking macros
Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:14:47 -07:00
William Hubbs
b4b93e32d7 staging: speakup: decext: remove custom locking macros
Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:11:10 -07:00
William Hubbs
6ca4dbe3a5 staging: speakup: apollo: remove custom locking macros
Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:11:09 -07:00
William Hubbs
995b904040 staging: speakup: acntpc: remove custom locking macros
Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:11:09 -07:00
William Hubbs
9fb31b1abd staging: speakup: serialio: remove custom locking macros
Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:11:09 -07:00
William Hubbs
8ec0826a38 staging: speakup: remove spk_trylock macro definition
Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:11:08 -07:00
William Hubbs
3efe810f23 staging: speakup: main: remove custom locking macros
Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:11:08 -07:00
William Hubbs
550e579a37 staging: speakup: i18n: remove custom locking macros
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:11:08 -07:00
William Hubbs
2da11ba637 staging: speakup: devsynth: remove custom locking macros
Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:11:07 -07:00
William Hubbs
c2d7f7430f staging: speakup: kobjects: remove custom locking macros
Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:11:07 -07:00
Chen Gang
e7b7691f52 staging: wlags49_h2: fix up "205179d staging: wlags49_h2: strncpy, need checking the memory length" for avoiding warnings
Type of 'probe_rsp->rawData[1]' is 'hcf_8' which is 'u8', it will
compare with 'int', so use min_t() to cast to 'u8' to avoid related
warning.

If use min(), it has '(void) (&_min1 == &_min2);', so if no type cast,
the compiler will report 'pointer types lacks a cast':

  drivers/staging/wlags49_h2/wl_main.c:3174:122: warning: comparison of distinct pointer types lacks a cast [enabled by default]

Signed-off-by: Chen Gang <gang.chen@asianux.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:08:00 -07:00
Leon Romanovsky
167bf09e2e staging: nvec: Convert to use devm_input_allocate
nvec_kbd is converted to use devm_input_allocate.
This simplifies error handling and remove path.

Signed-off-by: Leon Romanovsky <leon@leon.nu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:04:31 -07:00
H Hartley Sweeten
5e763f7bd9 staging: comedi: ni_labpc: remove *_ai_gain_bits tables
The bits needed to set the analog input gain can be simply calculated
based on the 'range'.

The LabPC versions of the board do not have the '0x10' gain that the
LabPC+ board supports. By incrementing the range appropriately the
correct gain bits can still be calculated.

This allows removing the two gain tables, as well as the export, along
with the 'ai_range_code' data in the boardinfo.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:03:44 -07:00
Dylan Socolobsky
8671438049 Staging: ft1000: Change C99 comments in ft1000_dnld.c
This simple patch fixes the ERRORs found by checkpatch.pl in the file
ft1000_dnld.c by switching to the standard Kernel comment style.

Signed-off-by: Dylan Socolobsky <dsocolobsky@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:03:44 -07:00
Dylan Socolobsky
6fb3c2bd69 Staging: ft1000: fix brace coding style in ft1000_dnld.c
This simple patch fixes a brace warning raised by checkpatch.pl in ft1000_dnld.c

Signed-off-by: Dylan Socolobsky <dsocolobsky@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:03:43 -07:00
Peter Huewe
85b38476fd staging/xgifb: Fix always false condition in vb_setmode.c (smatch)
Smatch complains:
drivers/staging/xgifb/vb_setmode.c:3181
XGI_SetLockRegs() warn: bitwise AND condition is false here

Since SetNTSCTV is defined as 0 in drivers/video/sis/initdef.h this is
correct.
-> Change the condition to == to fix this.

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:02:35 -07:00
Peter Huewe
986eb9fad5 staging/xgifb: Remove unnecessary binary calculation in GetXG27FPBits
If temp <= 2 no other bits than the lowest two (0x03) can be set anyway
-> this operation can be removed.

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:02:34 -07:00
Peter Huewe
9195ba095d staging/xgifb: Consolidate function almost identical calls in XGINew_GetXG21Sense
Instead of calling xgifb_reg_and_or with almost identical parameters in
a simple if/else scenario, we assign the changing parameter to a temp
variable and call xgifb_reg_and_or only from one location.

-> Easier to read, easier to understand (especially wrt the line breaks)

(For the if condition we don't need the Temp variable, so we can use the
value directly).

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:02:34 -07:00
Peter Huewe
bcd1f16573 staging/xgifb: Remove unnecessary cases in XGINew_SenseLCD
The switch statement sets the temp value to zero for certain cases and
leaves it untouched for other cases -> all these other cases can be
combined in the default case.

Since an empty case containing only a break, it can be removed.

The patch also removes the if statement, as it uses the same value as the switch
for comparison, and includes the code into the switch.

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:02:34 -07:00
Peter Huewe
fb70b191ee staging/xgifb: Remove uneccessary/simply if in XGINew_GetXG20DRAMType
Instead of storing the value in a temp variable, anding it with 1 and
assign data conditionally we can assign the value directly.

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:02:33 -07:00
Jeff Mahoney
e99e3d0018 staging/sb105x: remove asm/segment.h dependency
sb105x doesn't seem to actually need <asm/segment.h> (builds on x86
without it) and ppc/ppc64 doesn't provide it so it fails to build there.

This patch removes the dependency.

CC: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:01:46 -07:00
Jake Champlin
e6626de539 Staging: Panel: panel: Fixed checkpatch line length warnings
Fixed 4 cases of line length issues with checkpatch. Checkpatch is now clean
for panel.c.

Signed-off-by: 'Jake Champlin <jake.champlin.27@gmail.com>'
Acked-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 16:01:46 -07:00
Tülin İzer
0f1be19518 Staging: silicom: Fixed warning 'preferred seq_puts instead of seq_printf'.
This patch fixes warning in silicom/bpctl_mod.c : seq_puts has to be preferred
to seq_printf when the format is a constant string.

Signed-off-by: Tülin İzer <tulinizer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 15:53:36 -07:00
Tülin İzer
bd83515a90 Staging: vt6655: Fixed ERROR: do not use C99 // comments in vt6655/80211hdr.h
This patch fixes ERROR: do not use C99 // comments found by checkpatch
in vt6655/80211hdr.h.

Signed-off-by: Tülin İzer <tulinizer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 15:52:00 -07:00
Tülin İzer
9c358e547b Staging: vt6655: Fixed ERROR: do not use C99 // comments in vt6655/aes_ccmp.h.
This patch fixes ERROR: do not use C99 // comments found by checkpatch
in vt6655/aes_ccmp.c.

Signed-off-by: Tülin İzer <tulinizer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 15:52:00 -07:00
Tülin İzer
600816cc92 Staging: vt6655: Fixed ERROR: do not use C99 // comments in vt6655/aes_ccmp.c
This patch fixes ERROR: do not use C99 // comments found by checkpatch
in vt6655/aes_ccmp.c.

Signed-off-by: Tülin İzer <tulinizer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 15:51:59 -07:00
Tülin İzer
c52011c91d Staging: vt6655: Fixed ERROR: do not use C99 // comments in vt6655/80211mgr.h
This patch fixes ERROR: do not use C99 // comments found by checkpatch.pl
in vt6655/80211mgr.c

Signed-off-by: Tülin İzer <tulinizer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 15:51:58 -07:00
Tülin İzer
1b37f2949a Staging: vt6655: Fixed ERROR: do not use C99 // comments in 80211mgr.c
This patch fixes ERROR: do not use C99 // comments in vt6655/802mgr.c

Signed-off-by: Tülin İzer <tulinizer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 15:51:58 -07:00
Tülin İzer
6a301f4f14 Staging: silicom: Fixed error 'space prohibited before that close parenthesis ')''
This patch fixes error 'space prohibited before that close parenthesis ')'' found by
checkpatch in driver silicom.

Signed-off-by: Tülin İzer <tulinizer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 15:50:30 -07:00
Tülin İzer
001bd4b45b Staging: silicom: Fixed error 'space required after that ',''.
This patch fixes error 'space required after that ','' found by
checkpatch in driver silicom.

Signed-off-by: Tülin İzer <tulinizer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 15:50:30 -07:00
Tülin İzer
a7ce87e1c4 Staging: silicom: Fixed warning 'please, no space before tabs'.
This patch fixes warning 'please, no space before tabs' found by checkpatch
in driver silicom.

Signed-off-by: Tülin İzer <tulinizer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 15:50:29 -07:00
Tülin İzer
a0069a41a7 Staging: silicom : Fixed error 'exactly one space required after that #ifdef'
This patch fixes error 'exactly one space required after that #ifdef' found by
checkpatch in driver silicom.

Signed-off-by: Tülin İzer <tulinizer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 15:50:29 -07:00
Tülin İzer
01c7b4ca6e Staging: silicom: Fixed warning 'space prohibited before semicolon'.
This patch fixes warning 'space prohibited before semicolon' found by
checkpatch.pl in driver silicom.

Signed-off-by: Tülin İzer <tulinizer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 15:50:28 -07:00
Tülin İzer
f84b075178 Staging: silicom: Fixed error 'do not initialise statics to 0 or NULL'.
This patch fixes error 'do not initialise statics to 0 or NULL'. found by
checkpatch in driver silicom.

Signed-off-by: Tülin İzer <tulinizer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-05-16 15:50:28 -07:00