Amarjargal Gundjalam [Sun, 25 Oct 2015 14:48:56 +0000 (07:48 -0700)]
staging: slicoss: Adds space around operators
This patch fixes the checkpatch.pl check:
CHECK: spaces preferred around that ‘’
Signed-off-by: Amarjargal Gundjalam <amarjargal.gundjalam@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Amarjargal Gundjalam [Sun, 25 Oct 2015 14:48:55 +0000 (07:48 -0700)]
staging: slicoss: Removes unnecessary space after a cast
This patch fixes the checkpatch.pl check:
CHECK: No space is necessary after a cast
Signed-off-by: Amarjargal Gundjalam <amarjargal.gundjalam@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Amarjargal Gundjalam [Sun, 25 Oct 2015 14:48:54 +0000 (07:48 -0700)]
staging: slicoss: Removes multiple blank lines
This patch fixes the checkpatch.pl check:
CHECK: Please don't use multiple blank lines
Signed-off-by: Amarjargal Gundjalam <amarjargal.gundjalam@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Lijun Pan [Sun, 25 Oct 2015 22:41:19 +0000 (17:41 -0500)]
staging: fsl-mc: section mismatch bug fix
WARNING: drivers/staging/built-in.o(.init.text+0xdc): Section mismatch in reference from the function fsl_mc_bus_driver_init() to the function .exit.text:dprc_driver_exit()
The function __init fsl_mc_bus_driver_init() references
a function __exit dprc_driver_exit().
This is often seen when error handling in the init function
uses functionality in the exit path.
The fix is often to remove the __exit annotation of
dprc_driver_exit() so it may be used outside an exit section.
Signed-off-by: Lijun Pan <Lijun.Pan@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ksenija Stanojevic [Mon, 26 Oct 2015 15:05:57 +0000 (08:05 -0700)]
Staging: lustre: Replace LPROCFS_CLIMP_CHECK with lprocfs_climp_check
Static inline functions are preferred over macros. The function is
placed in obd_class.h instead lprocfs_status.h because obd_class.h
includes header obd.h which contains definition of struct obd_device
and in that way avoids build error: Dereferencing pointer to incomplete
type. Also remove macro LPROCFS_CLIMP_CHECK since it's no longer used.
Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Amitoj Kaur Chawla [Mon, 26 Oct 2015 17:07:26 +0000 (22:37 +0530)]
staging: lustre: ptlrpc: Replace seq_printf() with seq_putc()
Replace seq_printf() with seq_putc() since it is more expensive than
seq_putc().
Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cristina Moraru [Mon, 26 Oct 2015 22:30:08 +0000 (00:30 +0200)]
staging: lustre: Replace sscanf with kstrtoint
Replace single variable sscanf with specialized function
kstrtoint at the suggestion of checkpatch.pl, to fix
'WARNING: Prefer kstrto<type> to single variable sscanf'
Signed-off-by: Cristina Moraru <cristina.moraru09@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Mike Rapoport [Mon, 26 Oct 2015 08:06:30 +0000 (10:06 +0200)]
staging: lustre: remove unused OBD_PAGE_ALLOC/FREE and friends
The OBD_PAGE_ALLOC/FREE and related macros are not used and can be
removed
Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Mike Rapoport [Mon, 26 Oct 2015 08:06:29 +0000 (10:06 +0200)]
staging: lustre: get rid of OBD_PAGE_ALLOC/FREE
Use alloc_page and __free_page instead
Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cristina Moraru [Sun, 25 Oct 2015 21:16:31 +0000 (23:16 +0200)]
staging: lustre: Don't ignore error code
Error stored in rc was never reported,
so directly return it here.
Signed-off-by: Cristina Moraru <cristina.moraru09@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Shraddha Barke [Sun, 25 Oct 2015 00:26:55 +0000 (05:56 +0530)]
Staging: lustre: Remove unused obd_cache.h file
Remove the header file obd_cache.h since it is not needed
Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Shraddha Barke [Sun, 25 Oct 2015 00:19:42 +0000 (05:49 +0530)]
Staging: lustre: ptlrpc: Remove EXPORT_SYMBOL for sptlrpc_rule_set_expand
Since sptlrpc_rule_set_expand is static, export symbol is not needed
Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Amitoj Kaur Chawla [Sat, 24 Oct 2015 17:19:50 +0000 (22:49 +0530)]
staging: lustre: ldlm: Do not export static function
Remove the export symbol for static function.
The semantic patch used to find this is:
// <smpl>
@r@
type T;
identifier f;
@@
static T f (...) { ... }
@@
identifier r.f;
declarer name EXPORT_SYMBOL;
@@
-EXPORT_SYMBOL(f);
// </smpl>
Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ian Abbott [Fri, 23 Oct 2015 09:56:09 +0000 (10:56 +0100)]
staging: comedi: fix extreme case of comedi_nsamples_left()
`comedi_nsamples_left(s, nsamples)` returns the number of samples
remaining to complete an asynchronous command or the passed in
`nsamples`, whichever is lower. However, it goes wrong in the extreme
case of setting the `nsamples` parameter to `UINT_MAX` when the number
of conversions per "scan" (`s->async->cmd.scan_end_arg`) is 1. It uses
`comedi_nscans_remaining(s, nscans)` to determine the number of scans
remaining, or the parameter `nscans`, whichever is lower. To determine
the parameter `nscans`, it divides `nsamples` by the number of
conversions per scan and adds 1. The addition of 1 is to avoid setting
the parameter `nscans` to 0, as `comedi_nscans_remaining(s, nscans)`
treats that value specially. However in the extreme case where
`nsamples` is `UINT_MAX` and the number of samples per scan is 1, the
addition of 1 to `nscans` overflows, producing the unwanted 0.
Fix it by refactoring new a function `__comedi_nscans_remaining(s,
nscans)` out of `comedi_nscans_remaining(s, nscans)`. The new function
does everything except the special handling when `nscans` is 0. Change
`comedi_nsamples_remaining()` to call the new function without adding 1
to `nscans` to avoid the overflow.
This overflow bug doesn't affect any of the current COMEDI drivers. I
stumbled across it while changing to one of the drivers.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Shivani Bhardwaj [Mon, 26 Oct 2015 14:51:26 +0000 (20:21 +0530)]
Staging: wilc1000: coreconfigurator: Remove unnecessary parentheses
Parentheses around some arguments and expressions are not required and
should be removed.
Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Shivani Bhardwaj [Mon, 26 Oct 2015 14:51:05 +0000 (20:21 +0530)]
Staging: wilc1000: coreconfigurator: Remove irrelevant wrapper function
Remove the function get_current_channel() and replace its calls by
get_current_channel_802_11n() as the former function's definition
involves only returning the value of latter function.
Semantic patch used to find out the issue:
@@
identifier f,g;
@@
*f(...) {
return g(...); }
Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Shivani Bhardwaj [Mon, 26 Oct 2015 14:46:32 +0000 (20:16 +0530)]
Staging: wilc1000: coreconfigurator: Drop unneeded wrapper functions
Replace the wrapper functions get_address1(), get_address2() and get_address3()
with the standard kernel function ether_addr_copy().
Semantic patch used to identify the issue:
@@
identifier f,g;
@@
*f(...) {
g(...); }
Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Luis de Bethencourt [Mon, 26 Oct 2015 05:52:50 +0000 (05:52 +0000)]
staging: wilc1000: return -ENOMEM when kmalloc failed
The driver is using -1 instead of the -ENOMEM defined macro to specify that
a buffer allocation failed.
Fixes smatch warning and similars:
drivers/staging/wilc1000/host_interface.c:1757 Handle_Key() warn:
returning -1 instead of -ENOMEM is sloppy
Signed-off-by: Luis de Bethencourt <luisbg@osg.samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Chaehyun Lim [Mon, 26 Oct 2015 00:44:45 +0000 (09:44 +0900)]
staging: wilc1000: rename host_int_set_WEPDefaultKeyID
This patch replaces host_int_set_WEPDefaultKeyID with
host_int_set_wep_default_key to avoid camelcase.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Chaehyun Lim [Mon, 26 Oct 2015 00:44:44 +0000 (09:44 +0900)]
staging: wilc1000: rename u8Index in host_int_set_WEPDefaultKeyID
This patch changes second parameter of host_int_set_WEPDefaultKeyID from
u8Index to index to avoid camelcase.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Chaehyun Lim [Mon, 26 Oct 2015 00:44:43 +0000 (09:44 +0900)]
staging: wilc1000: fix parameter name of function declaration
This patch changes struct host_if_drv of host_int_set_WEPDefaultKeyID
function declaration from hWFIDrv to hif_drv in host_interface.h
With this change, first parameter name of this function declaration and
definition has same name as hif_drv.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Chaehyun Lim [Mon, 26 Oct 2015 00:44:42 +0000 (09:44 +0900)]
staging: wilc1000: fix return type of host_int_set_WEPDefaultKeyID
This patch changes return type of host_int_set_WEPDefaultKeyID from s32
to int. The result variable gets return value from wilc_mq_send that has
return type of int. It should be changed return type int as well as data
type of result variable.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Greg Kroah-Hartman [Tue, 27 Oct 2015 00:13:38 +0000 (09:13 +0900)]
Merge 4.3-rc7 into staging-next
We want the other staging patches in this branch as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Punit Vara [Sat, 24 Oct 2015 22:31:25 +0000 (04:01 +0530)]
Staging: wilc1000: Remove boolean comparision
This patch is to the host_interface.c file that fixes up following
warning reported by coccicheck:
WARNING: Comparison to bool
Boolean tests do not need explicit comparison to true or false
Signed-off-by: Punit Vara <punitvara@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Amitoj Kaur Chawla [Sat, 24 Oct 2015 16:39:05 +0000 (22:09 +0530)]
staging: rdma: amso1100: Drop unnecessary goto
Deletes the jump to a label on the next line when the label isn't used
anywhere else.
The semantic patch used to find this is:
// <smpl>
@r@
identifier l;
@@
-if (...) goto l;
-l:
// </smpl>
Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Muhammad Falak R Wani [Sun, 25 Oct 2015 10:43:23 +0000 (16:13 +0530)]
staging: rdma: hfi1: chip: Use setup_timer
Use the timer API function setup_timer instead of init_timer, removing
the structure field assignments.
<smpl>
@timer@
expression e1,e2,e3,fn_ptr;
@@
-init_timer(&e1);
+setup_timer(&e1, fn_ptr, e2);
... when != fn_ptr = e3
-e1.function = fn_ptr;
-e1.data = e2;
</smpl>
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Eva Rachel Retuya [Sat, 24 Oct 2015 14:35:47 +0000 (22:35 +0800)]
Staging: mt29f_spinand: Prefer using the BIT macro
Replace all instances of bit shifting on 1 with the BIT(x) macro. In
addition, convert other non-1 shift operations with the equivalent
BIT(x) macro for uniformity. Issue pointed out by checkpatch.
CHECK: Prefer using the BIT macro
Signed-off-by: Eva Rachel Retuya <eraretuya@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Eva Rachel Retuya [Sat, 24 Oct 2015 17:24:51 +0000 (01:24 +0800)]
Staging: mt29f_spinand: Replace udelay function with usleep_range
Use 'usleep_range' instead of 'udelay' to elapse time. For
spinand_reset, define the upper limit by a factor of 2 to keep the wait
short while still allowing a "good enough" range for wakeup. Define the
range 250us - 1ms for spinand_cmdfunc to provide enough leeway before
issuing spinand_reset. Checkpatch found this issue.
CHECK: usleep_range is preferred over udelay; see
Documentation/timers/timers-howto.txt
Signed-off-by: Eva Rachel Retuya <eraretuya@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Muhammad Falak R Wani [Sun, 25 Oct 2015 10:17:31 +0000 (15:47 +0530)]
staging: ipath: ipath_init_chip: Use setup_timer
Use of the timer API function setup_timer instead of init_timer, removing
the structure field assignments, and make the codeflow more readable.
The simplified sematic patch used is :-
<smpl>
@timer@
expression e1,e2,e3,fn_ptr;
@@
-init_timer(&e1);
+setup_timer(&e1, fn_ptr, e2);
... when != fn_ptr = e3
-e1.function = fn_ptr;
-e1.data = e2;
</smpl>
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Muhammad Falak R Wani [Sun, 25 Oct 2015 10:17:32 +0000 (15:47 +0530)]
staging: ipath: ipath_sdma: Use setup_timer
Use the timer API function setup_timer instead of init_timer, removing
the structure field assignments.
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Muhammad Falak R Wani [Sun, 25 Oct 2015 10:17:33 +0000 (15:47 +0530)]
staging: ipath: ipath_verbs: Use setup_timer
Use the timer API function setup_timer instead of init_timer, removing
the structure field assignments.
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Muhammad Falak R Wani [Sun, 25 Oct 2015 10:17:30 +0000 (15:47 +0530)]
staging: ipath: ipath_driver: Use setup_timer
Use the timer API function setup_timer instead of init_timer, removing
the structure field assignments.
The simplified semantic patch used is :-
<smpl>
@timer@
expression e1,e2,e3,fn_ptr;
@@
-init_timer(&e1);
+setup_timer(&e1, fn_ptr, e2);
... when != fn_ptr = e3
-e1.function = fn_ptr;
-e1.data = e2;
</smpl>
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Alison Schofield [Sat, 24 Oct 2015 04:33:34 +0000 (21:33 -0700)]
staging: r8723au: remove externs and include needed header file
Remove extern declaration and add include of header file to get same.
Addresses checkpatch.pl:
WARNING: externs should be avoided in .c files
Signed-off-by: Alison Schofield <amsfield22@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Alison Schofield [Sat, 24 Oct 2015 04:32:20 +0000 (21:32 -0700)]
staging: r8723au: replace explicit NULL comparisons with !
Replace explicit NULL comparison with ! operator to simplify code.
Addresses checkpatch.pl:
WARNING: Comparisons should place the constant on the right side of the
test
Signed-off-by: Alison Schofield <amsfield22@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Alison Schofield [Sat, 24 Oct 2015 04:28:00 +0000 (21:28 -0700)]
staging: r8723au: use kernel preferred style for commenting
Reworked comments per kernel coding style to improve readability.
Corrects checkpatch.pl:
WARNING: Block comments use * on subsequent lines
WARNING: line over 80 characters
Signed-off-by: Alison Schofield <amsfield22@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Burcin Akalin [Fri, 23 Oct 2015 21:30:03 +0000 (00:30 +0300)]
staging: wlan-ng: Do not use multiple blank lines.
Remove multiple blank lines. Problem found using checkpatch.pl
"CHECK: Please don't use multiple blank lines"
Signed-off-by: Burcin Akalin <brcnakalin@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Burcin Akalin [Fri, 23 Oct 2015 19:12:14 +0000 (22:12 +0300)]
staging: speakup: Remove multiple assignments
Remove multiple assignments by factorizing them.Problem found using
checkpatch.pl
CHECK: multiple assignments should be avoided
Signed-off-by: Burcin Akalin <brcnakalin@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Amitoj Kaur Chawla [Fri, 23 Oct 2015 18:14:48 +0000 (23:44 +0530)]
staging: vt6656: Remove unnecessary braces and tab spacing
This patch removes unnecessary braces around if-else single statement
blocks and unnecessary tab space aligning
Tool used is uncrustify.
Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Shraddha Barke [Fri, 23 Oct 2015 14:27:52 +0000 (19:57 +0530)]
Staging: rtl8723au: Use put_unaligned_le32
Introduce the use of function put_unaligned_le32.
A simplified version of Coccinelle semantic patch used -
@@ identifier tmp; expression ptr; expression y,e; type T; @@
- tmp = cpu_to_le32(y);
<+... when != tmp
- memcpy(ptr, (T)&tmp, ...);
+ put_unaligned_le32(y,ptr);
...+>
? tmp = e
@@ type T; identifier tmp; @@
- T tmp;
...when != tmp
Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Dennis Menschel [Wed, 21 Oct 2015 21:16:56 +0000 (23:16 +0200)]
staging: fbtft: fix voltage settings for C-Berry28
This patch fixes some internal voltage settings for the C-Berry28 display.
The original example source files for the C-Berry28 as provided by
its vendor admatec contained six issues where a command parameter's value
didn't match its corresponding comment.
I've informed admatec about these discrepancies on 2015-08-25. In the
meantime, I've assumed the comments to be more reliable than the code,
and thus have used these values to write the initial C-Berry28 driver.
After having received a reply from admatec on 2015-10-16 that the issues
have been fixed in their example code, it has turned out that for the
voltages VCOM and AVDD, the code was indeed correct, but the comments
were wrong. This patch is meant to fix these two pending mistakes.
Signed-off-by: Dennis Menschel <menschel-d@posteo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Dennis Menschel [Wed, 21 Oct 2015 21:16:55 +0000 (23:16 +0200)]
staging: fbtft: use init function instead of init sequence
This patch converts the default init sequence of the ST7789V
display controller into an init function, as init sequences
are considered deprecated by the maintainers of fbtft.
Signed-off-by: Dennis Menschel <menschel-d@posteo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Dennis Menschel [Wed, 21 Oct 2015 21:16:54 +0000 (23:16 +0200)]
staging: fbtft: remove redundant set_addr_win() function
This patch removes the function set_addr_win() from fb_st7789v.c, as its
definition is redundant to the default implementation fbtft_set_addr_win()
which can be found in fbtft-core.c.
Signed-off-by: Dennis Menschel <menschel-d@posteo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Dennis Menschel [Wed, 21 Oct 2015 21:16:53 +0000 (23:16 +0200)]
staging: fbtft: use MIPI DCS for ST7789V and C-Berry28
This patch makes use of the standard MIPI Display Command Set to remove
redundant entries from the command enum of the ST7789V display controller
and also some of the magic constants found in the init sequence of the
C-Berry28 display.
Signed-off-by: Dennis Menschel <menschel-d@posteo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Alison Schofield [Wed, 21 Oct 2015 06:09:37 +0000 (23:09 -0700)]
staging: r8723au: add & use local variable to simplify references
Add local variable scanned_queue to rtw_createbss_cmd23a_callback()
and use it (5x) to simplify references.
Addresses checkpatch.pl WARNING: line over 80 characters
Signed-off-by: Alison Schofield <amsfield22@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Alison Schofield [Wed, 21 Oct 2015 06:08:27 +0000 (23:08 -0700)]
staging: r8723au: move constant to right of comparison test
Move constant to right of comparison test to improve readability.
Addresses checkpatch.pl:
WARNING: Comparisons should place the constant on the
right side of the test
Signed-off-by: Alison Schofield <amsfield22@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Alison Schofield [Wed, 21 Oct 2015 06:06:45 +0000 (23:06 -0700)]
staging: r8723au: replace printk() with netdev_err()
Replace printk() with netdev_err() for uniform error reporting.
Issue found by checkpatch.
Signed-off-by: Alison Schofield <amsfield22@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Burcin Akalin [Thu, 22 Oct 2015 12:15:39 +0000 (15:15 +0300)]
staging: vt6655: Add space around '*'
Add space around operator '*'. Problem found using
checkpatch.pl
CHECK: spaces preferred around that '*' (ctx:VxV)
Signed-off-by: Burcin Akalin <brcnakalin@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Burcin Akalin [Wed, 21 Oct 2015 21:48:29 +0000 (00:48 +0300)]
staging: vt6655: Add space around '*'
Add space around operator '*'. Problem found using
checkpatch.pl
CHECK: spaces preferred around that '*' (ctx:VxV)
Signed-off-by: Burcin Akalin <brcnakalin@gmail.com>
Reviewed-by: Daniel Baluta <daniel.baluta@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Luis de Bethencourt [Wed, 21 Oct 2015 17:32:38 +0000 (18:32 +0100)]
staging: rtl8723au: core: rtw_wlan_util: fix misleading indentation
For loop is outside of the else branch of the above conditional statement.
Fixing misleading indentation.
Fix a smatch warning:
drivers/staging/rtl8723au/core/rtw_wlan_util.c:528
WMMOnAssocRsp23a() warn: curly braces intended?
Signed-off-by: Luis de Bethencourt <luisbg@osg.samsung.com>
Acked-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cristina Moraru [Wed, 21 Oct 2015 17:00:49 +0000 (20:00 +0300)]
staging: rtl8712: Replace kmalloc with kmalloc_array
Replace kmalloc with specialized function kmalloc_array
when the size is a multiplication of:
number_of_elements * size_of_element
Signed-off-by: Cristina Moraru <cristina.moraru09@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Burcin Akalin [Tue, 20 Oct 2015 20:29:31 +0000 (23:29 +0300)]
staging: netlogic: Do not use multiple blank lines.
Remove multiple blank lines. Problem found using checkpatch.pl
"CHECK: Please don't use multiple blank lines"
Signed-off-by: Burcin Akalin <brcnakalin@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ioana Ciornei [Wed, 21 Oct 2015 20:17:56 +0000 (23:17 +0300)]
staging: dgap: add spaces around binary operator '|'
This patch adds spaces around binary operator '|'.
Done with coccinelle semantic patch:
@@
identifier x, y, z;
@@
(
- x|y|z
+ x | y | z
|
- x|y
+ x | y
)
Signed-off-by: Ioana Ciornei <ciorneiioana@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ioana Ciornei [Wed, 21 Oct 2015 20:17:55 +0000 (23:17 +0300)]
staging: dgap: remove unnecessary brackets
This patch removes unnecessary brackets when dealing with
unary operators like '&'.
Done with coccinelle semantic patch:
@@
expression e;
@@
(
- &(e)
+ &e
)
Signed-off-by: Ioana Ciornei <ciorneiioana@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ioana Ciornei [Wed, 21 Oct 2015 20:17:54 +0000 (23:17 +0300)]
staging: dgap: remove unnecessary space after cast
This patch removes unnecessary spaces after the cast.
Patch done with coccinelle semantic patch:
@rule0@
type t;
identifier e;
constant c;
expression expr;
@@
(
- (t) e
+ (t)e
|
- (t) c
+ (t)c
|
- (t) expr
+ (t)expr
)
Signed-off-by: Ioana Ciornei <ciorneiioana@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ioana Ciornei [Wed, 21 Oct 2015 20:17:53 +0000 (23:17 +0300)]
staging: dgap: properly indent to match open paranthesis
Indent parameters and arguments passed to function calls to match
open paranthesis
Signed-off-by: Ioana Ciornei <ciorneiioana@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ioana Ciornei [Wed, 21 Oct 2015 20:17:52 +0000 (23:17 +0300)]
staging: dgap: remove unnecessary blank lines
This patch removes the unnecessary blank lines before a closed
bracket and after an open bracket.
Signed-off-by: Ioana Ciornei <ciorneiioana@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cristina Moraru [Tue, 20 Oct 2015 19:55:47 +0000 (22:55 +0300)]
staging: iio: magnetometer: Remove explicit comparisons
Remove comparisons to 0 or NULL
Signed-off-by: Cristina Moraru <cristina.moraru09@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cristina Moraru [Tue, 20 Oct 2015 19:55:46 +0000 (22:55 +0300)]
staging: iio: gyro: Remove explicit comparisons
Remove comparisons to 0 or NULL
Signed-off-by: Cristina Moraru <cristina.moraru09@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cristina Moraru [Tue, 20 Oct 2015 19:55:45 +0000 (22:55 +0300)]
staging: iio: trigger: Remove explicit comparisons
Remove comparisons to 0 or NULL
Signed-off-by: Cristina Moraru <cristina.moraru09@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cristina Moraru [Tue, 20 Oct 2015 19:55:44 +0000 (22:55 +0300)]
staging: iio: frequency: Remove explicit comparisons
Remove comparisons to 0 or NULL
Signed-off-by: Cristina Moraru <cristina.moraru09@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cristina Moraru [Tue, 20 Oct 2015 19:55:43 +0000 (22:55 +0300)]
staging: iio: cdc: Remove explicit comparisons
Remove comparisons to 0 or NULL
Signed-off-by: Cristina Moraru <cristina.moraru09@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cristina Moraru [Tue, 20 Oct 2015 19:55:42 +0000 (22:55 +0300)]
staging: iio: accel: Remove explicit comparisons
Remove comparisons to 0 or NULL
Signed-off-by: Cristina Moraru <cristina.moraru09@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cristina Moraru [Tue, 20 Oct 2015 19:55:41 +0000 (22:55 +0300)]
staging: iio: meter: Remove explicit comparisons
Remove comparisons to 0 or NULL
Signed-off-by: Cristina Moraru <cristina.moraru09@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cristina Moraru [Tue, 20 Oct 2015 19:55:40 +0000 (22:55 +0300)]
staging: iio: light: Remove explicit comparisons
Remove comparisons to 0 or NULL
Signed-off-by: Cristina Moraru <cristina.moraru09@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Anton Tatuev [Thu, 22 Oct 2015 15:37:30 +0000 (18:37 +0300)]
skein: fix coding style
Added spaces around binary operators.
Signed-off-by: Tatuev Anton <tatuev.a.a@yandex.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Burcin Akalin [Thu, 22 Oct 2015 13:25:08 +0000 (16:25 +0300)]
staging: skein: Add space around '%'
Add space around operator '%'. Problem found using
checkpatch.pl
CHECK: spaces preferred around that '%' (ctx:VxV)
Signed-off-by: Burcin Akalin <brcnakalin@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Burcin Akalin [Thu, 22 Oct 2015 21:01:35 +0000 (00:01 +0300)]
staging: octeon: Do not use multiple blank lines.
Remove multiple blank lines. Problem found using checkpatch.pl
"CHECK: Please don't use multiple blank lines".
Signed-off-by: Burcin Akalin <brcnakalin@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cristina Moraru [Wed, 21 Oct 2015 17:00:50 +0000 (20:00 +0300)]
staging: octeon-usb: Replace kmalloc with kmalloc_array
Replace kmalloc with specialized function kmalloc_array
when the size is a multiplication of:
number_of_elements * size_of_element
Signed-off-by: Cristina Moraru <cristina.moraru09@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Muhammad Falak R Wani [Mon, 19 Oct 2015 19:27:39 +0000 (00:57 +0530)]
staging: octeon: Remove explicit NULL comparison
Remove the explicit NULL comparison and rewrite in a compact form.
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Muhammad Falak R Wani [Mon, 19 Oct 2015 19:27:38 +0000 (00:57 +0530)]
staging: octeon: Remove explicit NULL comparison
Remove the explicit NULL comparison and rewrite in a compact form.
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Luis de Bethencourt [Mon, 19 Oct 2015 17:16:01 +0000 (18:16 +0100)]
staging: rtl8712: spaces preferred around operands
Clean up all instances of checkpatch.pl checks:
CHECK: spaces preferred around that '+'
(and other operands)
Signed-off-by: Luis de Bethencourt <luisbg@osg.samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Luis de Bethencourt [Mon, 19 Oct 2015 17:15:29 +0000 (18:15 +0100)]
staging: rtl8712: braces should be used on all arms
Fix all instances of the following checkpatch.pl check:
CHECK: braces {} should be used on all arms of this statement
Signed-off-by: Luis de Bethencourt <luisbg@osg.samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Luis de Bethencourt [Mon, 19 Oct 2015 17:14:29 +0000 (18:14 +0100)]
staging: rtl8712: Remove boolean comparisons
Boolean tests do not need explicit comparison to true or false.
Signed-off-by: Luis de Bethencourt <luisbg@osg.samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Muhammad Falak R Wani [Mon, 19 Oct 2015 17:07:51 +0000 (22:37 +0530)]
staging: ion: Remove explicit NULL comparison
Rewrite explicit NULL comparison in its simpler form.
<smpl>
@NULL_REPLACE@
expression e;
@@
-e == NULL
+ !e
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Luis de Bethencourt [Wed, 21 Oct 2015 17:29:59 +0000 (18:29 +0100)]
staging: rtl8188eu: fix misleading indentation
Code is correct, i needs to be moved back by 2 to correct for the last
iteration of the while loop, since READ_NEXT_PAIR advances two. Fixing
the misleading indentation.
Fix a smatch warning:
drivers/staging/rtl8188eu/hal/rf_cfg.c:217
rtl88e_phy_config_rf_with_headerfile() warn: curly braces intended?
Signed-off-by: Luis de Bethencourt <luisbg@osg.samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Anish Bhatt [Mon, 19 Oct 2015 05:51:41 +0000 (22:51 -0700)]
rtl8188eu : BIT() macro cleanup
Use the BIT(x) macro directly instead using multiple
BITX defines.
Signed-off-by: Anish Bhatt <anish@gatech.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Mateusz Kulikowski [Mon, 19 Oct 2015 20:00:30 +0000 (22:00 +0200)]
staging: rtl8192e: _rtl92e_fw_boot_cpu: Remove unneeded goto
Drop ugly label as no resource cleanup is needed.
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Mateusz Kulikowski [Mon, 19 Oct 2015 20:00:29 +0000 (22:00 +0200)]
staging: rtl8192e: fw: Use netdev_dbg instead of RT_TRACE
Drop legacy logging system.
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Mateusz Kulikowski [Mon, 19 Oct 2015 20:00:28 +0000 (22:00 +0200)]
staging: rtl8192e: Remove _rtl92e_fw_download_code()
Reuse rtl92e_send_cmd_pkt() instead.
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Mateusz Kulikowski [Mon, 19 Oct 2015 20:00:27 +0000 (22:00 +0200)]
staging: rtl8192e: Swap firmware endian in _rtl92e_fw_prepare()
Remove endian swap from _rtl92e_fw_download_code(),
this way it can be replaced with _rtl92e_send_cmd_pkt().
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Mateusz Kulikowski [Mon, 19 Oct 2015 20:00:26 +0000 (22:00 +0200)]
staging: rtl8192e: Add _rtl92e_fw_prepare
Add function to request and prepare firmware image.
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Mateusz Kulikowski [Mon, 19 Oct 2015 20:00:25 +0000 (22:00 +0200)]
staging: rtl8192e: Add _rtl92e_wait_for_fw()
Add function waiting for firmware load/boot;
Remove _rtl92e_is_fw_ready() that is obsolete (can be replaced
with _rtl92e_wait_for_fw().
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Mateusz Kulikowski [Mon, 19 Oct 2015 20:00:24 +0000 (22:00 +0200)]
staging: rtl8192e: init_fw: Drop unneded check
rst_opt is always equal to OPT_SYSTEM_RESET in this scope.
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Mateusz Kulikowski [Mon, 19 Oct 2015 20:00:23 +0000 (22:00 +0200)]
staging: rtl8192e: Rename rt_firmware::firmware_status to status
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Mateusz Kulikowski [Mon, 19 Oct 2015 20:00:22 +0000 (22:00 +0200)]
staging: rtl8192e: Add rt_fw_blob
rt_fw_blob contains single firmware blob and its size.
Update firmware loading code accordingly.
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Mateusz Kulikowski [Mon, 19 Oct 2015 20:00:21 +0000 (22:00 +0200)]
staging: rtl8192e: cmd_pkt: Handle INIT packets
Add support for DESC_PACKET_TYPE_INIT to rtl92e_send_cmd_pkt().
With this generalization, _rtl92e_fw_download_code() may be removed
after slight modification.
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Mateusz Kulikowski [Mon, 19 Oct 2015 20:00:20 +0000 (22:00 +0200)]
staging: rtl8192e: Use macro to represent fragmentation threshold
Add CMDPACKET_FRAG_SIZE macro and use it as fragmentation threshold
in send_cmd_pkt functions.
This makes rt_firmware::cmdpacket_frag_thresold and
rtl92e_init_fw_param() obsolete.
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Mateusz Kulikowski [Mon, 19 Oct 2015 20:00:19 +0000 (22:00 +0200)]
staging: rtl8192e: cmdpkt: Pass data as const void*
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Mateusz Kulikowski [Mon, 19 Oct 2015 20:00:18 +0000 (22:00 +0200)]
staging: rtl8192e: cmdpkt: Reorder arguments
Use send_cmd_pkt(dev, type, data , size) order to avoid confusion
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Mateusz Kulikowski [Mon, 19 Oct 2015 20:00:17 +0000 (22:00 +0200)]
staging: rtl8192e: cmdpkt: Simplify argument names
Rename:
codevirtualaddress -> data
buffer_len -> len
packettype -> type
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Mateusz Kulikowski [Mon, 19 Oct 2015 20:00:16 +0000 (22:00 +0200)]
staging: rtl8192e: cmdpkt: Use packettype properly
rtl92e_send_cmd_pkt used hardcoded NORMAL packet type.
As it may be used to send other packet types as well - use
provided packet type instead of defaults.
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Mateusz Kulikowski [Mon, 19 Oct 2015 20:00:15 +0000 (22:00 +0200)]
staging: rtl8192e: rtl_dm: Use proper packet type
rtl92e_send_cmd_packet sends only NORMAL packets, passing
invalid type (even it it's ignored) is confusing.
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Navya Sri Nizamkari [Mon, 19 Oct 2015 06:54:39 +0000 (12:24 +0530)]
Staging: emxx_udc: Add space around operator.
Add a space around '>>' operator.
Problem found using checkpatch.
Signed-off-by: Navya Sri Nizamkari <navyasri.tech@gmail.com>
Reviewed-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Luis de Bethencourt [Sun, 18 Oct 2015 21:59:18 +0000 (22:59 +0100)]
staging: emxx_udc: Remove boolean comparisons
Boolean tests do not need explicit comparison to true or false.
Signed-off-by: Luis de Bethencourt <luisbg@osg.samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Deepa Dinamani [Thu, 22 Oct 2015 01:42:37 +0000 (18:42 -0700)]
staging: ft1000: remove obsolete driver
Remove support for Qleadtek Flash-OFDM modems. Telecom carrier is
discontinuing service for the radio technology.
See http://www.gtigroup.org/news/ind/2015-08-18/6996.html.
Suggested-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Mon, 19 Oct 2015 20:13:05 +0000 (13:13 -0700)]
staging: comedi: adl_pci9118: tidy up pci9118_ai_setup_dma()
For aesthetics, init the dmalen[01] local variables when they are declared.
Use a local variable, 'scan_bytes', for the (devpriv->ai_n_realscanlen << 1)
calculation. For aesthetics and clarification, use comedi_bytes_per_sample()
instead of the '<< 1' shift to calculate the value.
The local variable 'i' is badly named. Remove it and use a local variable
'tmp' where it is used.
When checking the DMA buffer lengths for non-neverending commands the
scan length calculation, (devpriv->ai_n_realscanlen << 1) * cmd->stop_arg,
could overflow. Use and unsigned long long local variable to hold the
calculation and avoid the overflow.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Mon, 19 Oct 2015 20:13:04 +0000 (13:13 -0700)]
staging: comedi: adl_pci9118: rename interrupt_*() functions
For aesthetics, rename these functions so it they namespace associated
with the driver.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Mon, 19 Oct 2015 20:13:03 +0000 (13:13 -0700)]
staging: comedi: adl_pci9118: rename move_block_from_dma()
Rename this function so it has namespace associated with the driver.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Mon, 19 Oct 2015 20:13:02 +0000 (13:13 -0700)]
staging: comedi: adl_pci9118: rename valid_samples_in_act_dma_buf()
Rename this function so it has namespace associated with the driver.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Mon, 19 Oct 2015 20:13:01 +0000 (13:13 -0700)]
staging: comedi: adl_pci9118: rename interrupt_pci9118_ai_mode4_switch()
For aesthetics, remove "interrupt_" from this functions name to shorten
it a bit.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>