Leo Kim [Mon, 12 Oct 2015 07:55:54 +0000 (16:55 +0900)]
staging: wilc1000: remove typedef from tstrFoundNetworkInfo
This patch removes typedef from the struct tstrFoundNetworkInfo and
rename it to found_net_info.
Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Leo Kim [Mon, 12 Oct 2015 07:55:53 +0000 (16:55 +0900)]
staging: wilc1000: remove typedef from tenuHostIFstate
This patch removes typedef from the enum tenuHostIFstate and
rename it to host_if_state.
Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Leo Kim [Mon, 12 Oct 2015 07:55:52 +0000 (16:55 +0900)]
staging: wilc1000: remove typedef from tstrWILC_UsrConnReq
This patch removes typedef from the struct tstrWILC_UsrConnReq with the
related comments and renames it to user_conn_req.
Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Leo Kim [Mon, 12 Oct 2015 07:55:51 +0000 (16:55 +0900)]
staging: wilc1000: remove typedef from tstrWILC_UsrScanReq
This patch removes typedef from the struct tstrWILC_UsrScanReq with
related comments and renames it to user_scan_req.
Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Leo Kim [Mon, 12 Oct 2015 07:55:50 +0000 (16:55 +0900)]
staging: wilc1000: remove _tstrJoinParam from join_bss_param
This patch removes struct _tstrJoinParam from the struct join_bss_param
because it is not used inside the struct.
Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Leo Kim [Mon, 12 Oct 2015 07:55:49 +0000 (16:55 +0900)]
staging: wilc1000: remove typedef from tstrJoinBssParam
This patch removes typedef from the struct tstrJoinBssParam
and renames it to join_bss_param.
Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Leo Kim [Mon, 12 Oct 2015 07:55:48 +0000 (16:55 +0900)]
staging: wilc1000: remove unused struct tstrBssTable
This patch removes struct tstrBssTable with related comment.
Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Leo Kim [Mon, 12 Oct 2015 07:55:47 +0000 (16:55 +0900)]
staging: wilc1000: remove unused struct tstrWidJoinReqExt
This patch removes struct tstrWidJoinReqExt because it's not used.
Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Leo Kim [Mon, 12 Oct 2015 07:55:46 +0000 (16:55 +0900)]
staging: wilc1000: rename the member variable, ps8WidVal of wid
This patch renames ps8WidVal of struct wid to val.
Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Leo Kim [Mon, 12 Oct 2015 07:55:45 +0000 (16:55 +0900)]
staging: wilc1000: rename the member variable, s32ValueSize of wid
This patch renames s32ValueSize of struct wid to size.
Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Leo Kim [Mon, 12 Oct 2015 07:55:44 +0000 (16:55 +0900)]
staging: wilc1000: rename the member variable, u16WIDid of wid
This patch renames u16WIDid of struct wid to id.
Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Leo Kim [Mon, 12 Oct 2015 07:55:43 +0000 (16:55 +0900)]
staging: wilc1000: rename the member variable, enuWIDtype of wid
This patch renames enuWIDtype of struct wid to type.
Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Leo Kim [Mon, 12 Oct 2015 07:55:42 +0000 (16:55 +0900)]
staging: wilc1000: remove typedef from tenuWIDtype
This patch remove typedef from the enum tenuWIDtype
and rename it to WID_TYPE.
Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Leo Kim [Mon, 12 Oct 2015 07:55:41 +0000 (16:55 +0900)]
staging: wilc1000: remove typedef from tstrWID
This patch removes typedef from the struct tstrWID and
rename it to wid.
Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tony Cho [Mon, 12 Oct 2015 07:55:40 +0000 (16:55 +0900)]
staging: wilc1000: change parameter names in send_config_pkt
This patch changes the parameter names in send_config_pkt function as
the followings:
- u8Mode to mode
- pstrWIDs to wids
- u32WIDsCount to count
- drvHandler to drv
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tony Cho [Mon, 12 Oct 2015 07:55:39 +0000 (16:55 +0900)]
staging: wilc1000: remove bool bRespRequired from send_config_pkt
This patch removes 4th parameter, bool bRespRequired from the
send_config_pkt function because it is not used inside the funcntion.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Leo Kim [Mon, 12 Oct 2015 07:55:38 +0000 (16:55 +0900)]
staging: wilc1000: wilc_wfi_cfgoperations.c : removes unused local variables
This patch removes useless local variable, s32Error and returns directly
zero from wilc_wfi_cfgoperations.c and also removes incorrect break in
switch-case statement. The break is not useless which is being called right
after return statement.
Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Leo Kim [Mon, 12 Oct 2015 07:55:37 +0000 (16:55 +0900)]
staging: wilc1000: host_interface.c : removes unused local variables
This patch removes unused local variables from host_interface.c.
The unused local variable, s32Error is used just to return zero, so this
patch calls "returns 0" instead of "return s32Error" after removing
s32Error.
Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Leo Kim [Mon, 12 Oct 2015 07:55:36 +0000 (16:55 +0900)]
staging: wilc1000: rename the member variable, drvHandler of host_if_msg
This patch renames drvHandler of struct host_if_msg to drv.
Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Leo Kim [Mon, 12 Oct 2015 07:55:35 +0000 (16:55 +0900)]
staging: wilc1000: remove typedef from tstrWILC_WFIDrv
This patch removes typedef from the struct tstrWILC_WFIDrv and
rename it to host_if_drv.
This patch includes the removal of the comment for tstrWILC_WFIDrv as well.
Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Alison Schofield [Mon, 12 Oct 2015 20:53:22 +0000 (13:53 -0700)]
staging: gdmwm: move variables to right side of comparison test
Move variables to right side of comparison test to improve readability.
Signed-off-by: Alison Schofield <amsfield22@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Shivani Bhardwaj [Mon, 12 Oct 2015 17:44:15 +0000 (23:14 +0530)]
Staging: vt6655: mac: Remove extra braces
Remove braces from an if block as it comprises of a single statement.
Fix checkpatch warning: braces {} are not necessary for single statement
blocks
Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
Reviewed-by: Daniel Baluta <daniel.baluta@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Shivani Bhardwaj [Sun, 11 Oct 2015 19:19:34 +0000 (00:49 +0530)]
Staging: vt6655: rxtx: Remove extra parentheses
Remove unnecessary parentheses around if test expressions.
Fixes checkpatch warning : unnecessary parentheses
Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Shivani Bhardwaj [Sun, 11 Oct 2015 19:19:08 +0000 (00:49 +0530)]
Staging: vt6655: rxtx: Remove extra space character
Remove unnecessary space character after the variable RATE_16M
preserving the alignment of all other variables and comments.
Fixes the warning by checkpatch: space prohibited before
that ',' (ctx:WxW)
Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Paul McQuade [Sun, 11 Oct 2015 15:22:10 +0000 (16:22 +0100)]
Staging: vt6655: Renamed uRATE to rate
Renamed uRATE to rate to avoid camelcase
Signed-off-by: Paul McQuade <paulmcquad@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Shraddha Barke [Fri, 9 Oct 2015 15:33:29 +0000 (21:03 +0530)]
Staging: rtl8192e: Use kcalloc instead of kzalloc to allocate array
The advantage of kcalloc is, that will prevent integer overflows which
could result from the multiplication of number of elements and size and
it is also a bit nicer to read.
Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Aaro Koskinen [Mon, 12 Oct 2015 13:12:34 +0000 (16:12 +0300)]
staging: octeon-ethernet: xaui: use common init
Use common init.
Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Aaro Koskinen [Mon, 12 Oct 2015 13:12:33 +0000 (16:12 +0300)]
staging: octeon-ethernet: xaui: don't register poll function in init
Link status poll function is already controlled by open/stop functions,
so we don't need to do it on init.
This eliminates a redundant xaui link status notification when the module
is loaded.
Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cristina Moraru [Fri, 9 Oct 2015 19:17:58 +0000 (22:17 +0300)]
staging: octeon: Fix kernel-doc function description
Fix kernel-doc 'Excess function parameter' by moving
the description to the correct location. Also corrected
parameter description
Signed-off-by: Cristina Moraru <cristina.moraru09@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cristina Moraru [Fri, 9 Oct 2015 19:17:57 +0000 (22:17 +0300)]
staging: octeon: Remove /** from regular comments
Fix kernel-doc warnings 'cannot understand function prototype'
by removing /** from regular comments
Signed-off-by: Cristina Moraru <cristina.moraru09@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cristina Moraru [Fri, 9 Oct 2015 19:17:56 +0000 (22:17 +0300)]
staging: octeon: Remove extra line from kernel-doc
Fix 'bad line' kernel-doc warning
Signed-off-by: Cristina Moraru <cristina.moraru09@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
David Kershner [Mon, 12 Oct 2015 19:19:46 +0000 (15:19 -0400)]
staging: unisys: vmcallinterface.h: Cleanup unused fields
With the simplified driver models we have more vmcalls that aren't
supported by linux guests.
Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
David Kershner [Mon, 12 Oct 2015 19:19:45 +0000 (15:19 -0400)]
staging: unisys: diagchannel.h: get rid of unused fields
Some more churn of the drivers have made more fields unused, get
rid of them.
Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
David Kershner [Mon, 12 Oct 2015 19:19:44 +0000 (15:19 -0400)]
staging: unisys: periodic_work.h Fix spacing
Cleanup the multiple blank lines check in periodic_work.h.
Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
David Kershner [Mon, 12 Oct 2015 19:19:43 +0000 (15:19 -0400)]
staging: unisys: periodic_work.h Fix parenthesis alignment
Cleanup the checkpatch.pl check alignment should match open parenthesis, in
visor_periodic_work_create().
Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
David Kershner [Mon, 12 Oct 2015 19:19:42 +0000 (15:19 -0400)]
staging: unisys: visorchannel.c remove unneeded parenthesis
Fix the checkpatch.pl -strict check:
CHECK: Unnecessary parentheses around sig_hdr.num_overflows
+ &(sig_hdr.num_overflows),
Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
David Kershner [Mon, 12 Oct 2015 19:19:41 +0000 (15:19 -0400)]
staging: unisys: visorchannel.c fix spacing around cast
Clean up the following checkpatch.pl --strict checks:
CHECK: No space is necessary after a cast
+ buf = (u8 *) __get_free_page(GFP_KERNEL);
CHECK: No space is necessary after a cast
+ free_page((unsigned long) buf);
CHECK: spaces preferred around that '+' (ctx:VxE)
+ SIG_QUEUE_OFFSET(&channel->chan_hdr, queue)+
\
^
Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
David Kershner [Mon, 12 Oct 2015 19:19:40 +0000 (15:19 -0400)]
staging: unisys: channel.h Fix spacing around operands.
Clean up the seven checks reported by checkpatch.pl --strict.
CHECK: spaces preferred around that '<<' (ctx:VxV)
+#define SIGNATURE_16(A, B) ((A) | (B<<8))
^
CHECK: spaces preferred around that '+' (ctx:VxV)
+#define COVERQ(v, d) (((v)+(d)-1) / (d))
^
CHECK: spaces preferred around that '-' (ctx:VxV)
+#define COVERQ(v, d) (((v)+(d)-1) / (d))
^
CHECK: spaces preferred around that '*' (ctx:VxV)
+#define COVER(v, d) ((d)*COVERQ(v, d))
^
CHECK: spaces preferred around that '-' (ctx:VxE)
+ chan->QHDRFLD.sig_base_offset = (u64)(chan->QDATAFLD)- \
^
CHECK: spaces preferred around that '/' (ctx:VxV)
+ sizeof(chan->QDATAFLD)/sizeof(QDATATYPE); \
^
CHECK: spaces preferred around that '-' (ctx:VxV)
+ chan->QHDRFLD.max_signals = chan->QHDRFLD.max_slots-1; \
Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
David Kershner [Mon, 12 Oct 2015 19:19:39 +0000 (15:19 -0400)]
staging: unisys: channel.h covert from pragma to __packed
Need to convert from #pragma to __packed for channel structures.
Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tim Sell [Mon, 12 Oct 2015 19:28:57 +0000 (15:28 -0400)]
staging: unisys: visornic: prevent faults if driver re-loaded during stress
Prevent faults that would occur during this sequence of activity during
network stress:
rmmod visornic
modprobe visornic
/etc/init.d/network restart
The problem fixed was that the back-end IO partition was holding onto
stale receive buffers after the "rmmod visornic", and erroneously
completing them after a subsequent "modprobe visornic". This is fixed
in this patch as follows:
* Tell the back-end IO partition that we want it to employ its
"incarnation mechanism" to ensure it does not complete stale receive
buffers after the guest virtual device environment changes (e.g., by
re-loading the driver), by setting the
ULTRA_IO_DRIVER_SUPPORTS_ENHANCED_RCVBUF_CHECKING feature bit, and
supplying a unique incarnation number in rcvpost.unique_num for each
receive buffer posted.
* When visornic loads, make sure we drain and ignore any possible-stale
data in the channel before beginning network operation.
Prior to this patch, faults like this would occur almost every time if
you attempted to rmmod + modprobe the visornic driver and restart the
network service during heavy network activity:
BUG: spinlock bad magic on CPU#0, ksoftirqd/0/3
lock: 0xffff88002d8a56d8, .magic:
ffff8800, .owner: <none>/-1,
.owner_cpu: 2304
CPU: 0 PID: 3 Comm: ksoftirqd/0 Tainted: G C
4.3.0-rc3-ARCH+ #74
Signed-off-by: Tim Sell <timothy.sell@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Shraddha Barke [Fri, 9 Oct 2015 15:33:28 +0000 (21:03 +0530)]
Staging: unisys: Use kcalloc instead of kzalloc to allocate array
The advantage of kcalloc is, that will prevent integer overflows which
could result from the multiplication of number of elements and size and
it is also a bit nicer to read.
Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ivan Safonov [Sat, 10 Oct 2015 12:23:50 +0000 (19:23 +0700)]
staging: rtl8188eu: spaces preferred around that + inserted
This patch inserts spaces preferred around that '+' found by checkpatch.
Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ivan Safonov [Sat, 10 Oct 2015 12:21:54 +0000 (19:21 +0700)]
staging: rtl8188eu: ARRAY_SIZE instead of sizeof/sizeof used
This patch inserts ARRAY_SIZE instead of sizeof(type array[])/sizeof(type),
made arraylen variable constant
and removes unnecessary default value in variable definition.
Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Shraddha Barke [Thu, 8 Oct 2015 19:25:19 +0000 (00:55 +0530)]
Staging: rtl8188eu: core: Use ARRAY_SIZE macro
ARRAY_SIZE is more concise to use when the size of an array is divided
by the size of its type.
Changes made using Coccinelle-
@@
type T;
T[] E;
@@
- (sizeof(E)/sizeof(T))
+ ARRAY_SIZE(E)
Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ivan Safonov [Thu, 8 Oct 2015 06:40:11 +0000 (13:40 +0700)]
staging: rtl8188eu: unused macro read_next_pair removed
Unused macro read_next_pair removed from rtl8188eu driver.
Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Iban Rodriguez [Mon, 5 Oct 2015 19:18:09 +0000 (21:18 +0200)]
Staging: rtl8188eu: Correct coding style errors
Correct errors reported by checkpatch.pl because space prohibited
before ','.
Also split one line into two as it was longer than
80 characters
Signed-off-by: Iban Rodriguez <iban.rodriguez@ono.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Luis de Bethencourt [Sun, 11 Oct 2015 13:16:57 +0000 (14:16 +0100)]
staging: rtl8712: fix negative level value
range->avg_qual.level is of type uint8, so it shouldn't be assigned a
negative number. Assigning it 0x100 - 78, which is the equivalent
to (20 + -98) dBm when IW_QUAL_DBM is set.
Signed-off-by: Luis de Bethencourt <luisbg@osg.samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Amitoj Kaur Chawla [Sat, 10 Oct 2015 12:24:09 +0000 (17:54 +0530)]
staging: rtl8712: usleep_range is preferred over udelay
Fix checkpatch.pl issue: "CHECK: usleep_range is preferred over
udelay;
see Documentation/timers/timers-howto.txt".
Replace `udelay()` with a call to `usleep_range()` with a reasonable
upper limit determined by the other sleeping functions present.
Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Amitoj Kaur Chawla [Sat, 10 Oct 2015 09:01:11 +0000 (14:31 +0530)]
staging: rtl8712: Replace GFP_ATOMIC with GFP_KERNEL
Replace GFP_ATOMIC with GFP_KERNEL since GFP_ATOMIC is used in
atomic context and only needed when functions are not allowed to sleep
whereas the function is later calling msleep().
Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Shraddha Barke [Thu, 8 Oct 2015 19:25:18 +0000 (00:55 +0530)]
Staging: rtl8712: Use ARRAY_SIZE macro
ARRAY_SIZE is more concise to use when the size of an array is divided
by the size of its type
Changes made using Coccinelle-
@@
type T;
T[] E;
@@
- (sizeof(E)/sizeof(T))
+ ARRAY_SIZE(E)
Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Luis de Bethencourt [Sun, 11 Oct 2015 13:42:01 +0000 (14:42 +0100)]
staging: rtl8192u: r8192U_wx: fix negative noise and level values
range->max_qual.noise and level are of type uint8, so they shouldn't be
assigned a negative number. Assigning them 0x100 - 98, and 0x100 - 78 which
are the equivalent to -98 dBm and -78 dBm, respectively, when IW_QUAL_DBM
is set.
Signed-off-by: Luis de Bethencourt <luisbg@osg.samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Luis de Bethencourt [Sun, 11 Oct 2015 13:31:07 +0000 (14:31 +0100)]
staging: rtl8192u: r8192U_core: fix negative noise value
ieee80211_rx_stats.noise is of type uint8, so it shouldn't be assigned a
negative number. Assigning it 0x100 - 98, which is the equivalent
to -98 dBm when IW_QUAL_DBM is set.
Signed-off-by: Luis de Bethencourt <luisbg@osg.samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Shraddha Barke [Sun, 11 Oct 2015 05:11:23 +0000 (10:41 +0530)]
Staging: rtl8192u: ieee80211: ieee80211_rx: Remove commented printk messages
Remove commented out printk messages since they are not needed. Also remove
the unnecessary braces and blank lines
Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
Reviewed-by: Daniel Baluta <daniel.baluta@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Shraddha Barke [Sun, 11 Oct 2015 05:11:22 +0000 (10:41 +0530)]
Staging: rtl8192u: ieee80211: ieee80211_wx: Remove commented printk messages
Remove commented out printk messages since they are not needed
Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
Reviewed-by: Daniel Baluta <daniel.baluta@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Shraddha Barke [Sun, 11 Oct 2015 05:11:21 +0000 (10:41 +0530)]
Staging: rtl8192u: ieee80211: ieee80211_softmac: Remove commented printk messages
Remove commented printk since it is not needed
Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
Reviewed-by: Daniel Baluta <daniel.baluta@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ksenija Stanojevic [Thu, 8 Oct 2015 15:21:49 +0000 (17:21 +0200)]
Staging: rtl8192u: Do not DMA on the stack
Fix error "doing DMA on the stack" by using kzalloc for buffer
allocation.
Issue found by smatch.
Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Alison Schofield [Mon, 12 Oct 2015 21:28:36 +0000 (14:28 -0700)]
staging: rdma: hfi1: remove unnecessary out of memory messages
Out of memory messages are unnecssary in the drivers as they are
reported by memory management.
Addresses checkpatch.pl: WARNING: Possible unnecessary 'out of memory' message
Signed-off-by: Alison Schofield <amsfield22@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Shraddha Barke [Fri, 9 Oct 2015 15:33:27 +0000 (21:03 +0530)]
Staging: rdma: ipath: Use kcalloc instead of kzalloc to allocate array
The advantage of kcalloc is, that will prevent integer overflows which
could result from the multiplication of number of elements and size and
it is also a bit nicer to read.
Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Shraddha Barke [Fri, 9 Oct 2015 15:33:26 +0000 (21:03 +0530)]
Staging: rdma: hfi1: Use kcalloc instead of kzalloc to allocate array
The advantage of kcalloc is, that will prevent integer overflows which
could result from the multiplication of number of elements and size and
it is also a bit nicer to read.
Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ksenija Stanojevic [Fri, 9 Oct 2015 13:56:59 +0000 (15:56 +0200)]
Staging: rdma: Use memdup_user
Use memdup_user when user data is immediately copied into the
allocated region.
Issue found using coccinelle.
Signed-off-by: Ksenija Stanojevic<ksenija.stanojevic@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Shraddha Barke [Mon, 12 Oct 2015 13:14:34 +0000 (18:44 +0530)]
Staging: most: hdm-i2c: Drop owner assignment from i2c driver
i2c_driver does not need to set an owner because core will set it
Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Masanari Iida [Sat, 10 Oct 2015 04:42:49 +0000 (13:42 +0900)]
Staging: most: Fix typo in staging/most
This patch fix spelling typo found in most
Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Binbin Zhou [Mon, 12 Oct 2015 01:48:27 +0000 (09:48 +0800)]
staging: sm750fb: Fix the power state error in resume
The PM_EVENT_RESUME state is needed when SM750 resume, otherwise it
will be failed in the second time of continuous suspend/resume.
Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Signed-off-by: Binbin Zhou <zhoubb@lemote.com>
Reviewed-by: Huacai Chen <chenhc@lemote.com>
Reviewed-by: Teddy Wang <teddy.wang@siliconmotion.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Amitoj Kaur Chawla [Fri, 9 Oct 2015 20:51:30 +0000 (02:21 +0530)]
staging: sm750fb: Add space around '&'
Add space around operator '&'. Problem found using
checkpatch.pl
CHECK: spaces preferred around that '&' (ctx:VxV)
Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Amitoj Kaur Chawla [Fri, 9 Oct 2015 20:50:36 +0000 (02:20 +0530)]
staging: sm750fb: Add space around '<<'
Add space around operator '<<'. Problem found using
checkpatch.pl
CHECK: spaces preferred around that '<<' (ctx:VxV)
Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Amitoj Kaur Chawla [Fri, 9 Oct 2015 20:49:00 +0000 (02:19 +0530)]
staging: sm750fb: Remove multiple blank lines
Remove multiple blank lines. Problem found using checkpatch.pl
CHECK: Please don't use multiple blank lines
Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Amitoj Kaur Chawla [Fri, 9 Oct 2015 20:47:44 +0000 (02:17 +0530)]
staging: sm750fb: Rename dispState
Rename dispState to disp_state to avoid CamelCase. Problem found using
checkpatch.pl
CHECK: Avoid CamelCase: <dispState>
Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Amitoj Kaur Chawla [Fri, 9 Oct 2015 20:46:02 +0000 (02:16 +0530)]
staging: sm750fb: Remove multiple blank lines
Remove multiple blank lines. Problem found using checkpatch.pl
CHECK: Please don't use multiple blank lines
Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Amitoj Kaur Chawla [Fri, 9 Oct 2015 20:44:27 +0000 (02:14 +0530)]
staging: sm750fb: Rename miniDiff
Rename miniDiff to mini_diff to avoid CamelCase. Problem found using
checkpatch.pl
CHECK: Avoid CamelCase: <miniDiff>
Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Amitoj Kaur Chawla [Thu, 8 Oct 2015 21:45:01 +0000 (03:15 +0530)]
staging: sm750fb: Remove space after opening brace
Remove space after opening brace '{'. Problem found using
checkpatch.pl
CHECK: Blank lines aren't necessary after an open brace '{'
Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Amitoj Kaur Chawla [Thu, 8 Oct 2015 21:41:59 +0000 (03:11 +0530)]
staging: sm750fb: Remove space before closing brace
Remove space before closing brace '}'. Problem found using
checkpatch.pl
CHECK: Blank lines aren't necessary before a close brace '}'
Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Amitoj Kaur Chawla [Thu, 8 Oct 2015 21:40:15 +0000 (03:10 +0530)]
staging: sm750fb: Remove space after cast
Remove unnecessary space after cast. Problem found using checkpatch.pl
CHECK: No space is necessary after a cast
Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Shraddha Barke [Thu, 8 Oct 2015 19:25:17 +0000 (00:55 +0530)]
Staging: sm750fb: Use ARRAY_SIZE macro
ARRAY_SIZE is more concise to use when the size of an array is divided
by the size of its first element.
Changes made using Coccinelle-
@@
type T;
T[] E;
@@
- (sizeof(E)/sizeof(E[...]))
+ ARRAY_SIZE(E)
Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Amitoj Kaur Chawla [Mon, 12 Oct 2015 21:43:02 +0000 (03:13 +0530)]
staging: lustre: llite: Remove useless cast on void pointer
The semantic patch used to find this is:
@r@
expression x;
void* e;
type T;
identifier f;
@@
(
*((T *)e)
|
((T *)x)[...]
|
((T *)x)->f
|
- (T *)
e
)
Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Shraddha Barke [Mon, 12 Oct 2015 15:19:18 +0000 (20:49 +0530)]
Staging: lustre: osc: Remove null check before kfree
kfree on NULL pointer is a no-op.
The semantic patch used to find such an instance where NULL check is
present before kfree-
// <smpl>
@@ expression E; @@
- if (E != NULL) { kfree(E); }
+ kfree(E);
@@ expression E; @@
- if (E != NULL) { kfree(E); E = NULL; }
+ kfree(E);
+ E = NULL;
// </smpl>smpl>
Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
Reviewed-by: Daniel Baluta <daniel.baluta@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ryan Van Quinlan [Sun, 11 Oct 2015 04:53:50 +0000 (21:53 -0700)]
staging: lustre: lclient: NULL comparison style
Fixes checkpatch.pl checks:
CHECK: Comparison to NULL could be written ...
Signed-off-by: Ryan Van Quinlan <ryan.van.quinlan@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Shraddha Barke [Fri, 9 Oct 2015 17:10:07 +0000 (22:40 +0530)]
Staging: lustre: obdclass: lprocfs_status: Declare local functions as static
Declare lustre_attr_show and lustre_attr_store as static
since they are used only in this particular file. Also remove them from
corresponding header files.
Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Shraddha Barke [Fri, 9 Oct 2015 17:10:06 +0000 (22:40 +0530)]
Staging: lustre: obdclass: lu_object: Declare local functions as static
Declare lu_dev_add_linkage and lu_object_find as static since they are
used only in this particular file. Also remove the corresponding
declarations from header file.
Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Yazen Ghannam [Thu, 8 Oct 2015 23:01:16 +0000 (19:01 -0400)]
staging/lustre: Remove unused, commented function call
Also fixes a coding style error.
Signed-off-by: Yazen Ghannam <yghannam@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Shraddha Barke [Thu, 8 Oct 2015 18:06:47 +0000 (23:36 +0530)]
Staging: lustre: Remove unused libiam.h header
Remove libiam.h since it is not used anywhere throughout the kernel.
Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Aybuke Ozdemir [Fri, 9 Oct 2015 13:31:38 +0000 (16:31 +0300)]
Staging: skein: Remove space after cast
Remove unnecessary space after cast. Problem found using checkpatch.pl
CHECK: No space is necessary after a cast.
Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Aybuke Ozdemir [Fri, 9 Oct 2015 13:31:37 +0000 (16:31 +0300)]
Staging: skein: Remove multiple blank lines
Remove multiple blank lines. Problem found using checkpatch.pl
CHECK: Please don't use multiple blank lines.
Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Deepa Dinamani [Fri, 9 Oct 2015 04:57:25 +0000 (21:57 -0700)]
staging: skein: remove extra indentation
Fix macros containing do/while blocks to be indented uniformly.
This patch fixes the checkpatch.pl warning:
WARNING: suspect code indent for conditional statements
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Deepa Dinamani [Fri, 9 Oct 2015 04:58:36 +0000 (21:58 -0700)]
staging: skein: fix block comment style
Use a separate line for the opening marker of a comment block,
a leading asterisk in front of subsequent lines in the block comment,
and a separate line for the closing marker of the comment block.
This patch fixes the checkpatch.pl warnings:
WARNING: Block comments use a trailing */ on a separate line
WARNING: Block comments use * on subsequent lines
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Greg Kroah-Hartman [Mon, 12 Oct 2015 17:46:53 +0000 (10:46 -0700)]
Merge 4.3-rc5 into staging-next
We want the fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Linus Torvalds [Sun, 11 Oct 2015 18:09:45 +0000 (11:09 -0700)]
Linux 4.3-rc5
Linus Torvalds [Sun, 11 Oct 2015 17:24:32 +0000 (10:24 -0700)]
Merge branch 'sched-urgent-for-linus' of git://git./linux/kernel/git/tip/tip
Pull scheduler fix from Thomas Gleixner:
"Fix a long standing state race in finish_task_switch()"
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched/core: Fix TASK_DEAD race in finish_task_switch()
Linus Torvalds [Sun, 11 Oct 2015 17:23:52 +0000 (10:23 -0700)]
Merge branch 'perf-urgent-for-linus' of git://git./linux/kernel/git/tip/tip
Pull perf fix from Thomas Glexiner:
"Fix build breakage on powerpc in perf tools"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf tools: Fix build break on powerpc due to sample_reg_masks
Linus Torvalds [Sun, 11 Oct 2015 17:23:00 +0000 (10:23 -0700)]
Merge branch 'x86-urgent-for-linus' of git://git./linux/kernel/git/tip/tip
Pull maintainer email update from Thomas Gleixner:
"Change Matt Fleming's email address in the maintainers file"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
MAINTAINERS: Change Matt Fleming's email address
Linus Torvalds [Sun, 11 Oct 2015 17:16:59 +0000 (10:16 -0700)]
Merge branch 'irq-urgent-for-linus' of git://git./linux/kernel/git/tip/tip
Pull irq fixes from Thomas Gleixner:
"Three trivial commits:
- Fix a kerneldoc regression
- Export handle_bad_irq to unbreak a driver in next
- Add an accessor for the of_node field so refactoring in next does
not depend on merge ordering"
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqdomain: Add an accessor for the of_node field
genirq: Fix handle_bad_irq kerneldoc comment
genirq: Export handle_bad_irq
Linus Torvalds [Sun, 11 Oct 2015 17:02:30 +0000 (10:02 -0700)]
Merge tag 'scsi-fixes' of git://git./linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"This is a set of three bug fixes, two of which are regressions from
recent updates (the 3ware one from 4.1 and the device handler fixes
from 4.2)"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
3w-9xxx: don't unmap bounce buffered commands
scsi_dh: Use the correct module name when loading device handler
libiscsi: Fix iscsi_check_transport_timeouts possible infinite loop
Linus Torvalds [Sun, 11 Oct 2015 16:35:51 +0000 (09:35 -0700)]
Merge tag 'md/4.3-rc4-fix' of git://neil.brown.name/md
Pull md bugfix from Neil Brown:
"One bug fix for raid1/raid10.
Very careless bug earler in 4.3-rc, now fixed :-)"
* tag 'md/4.3-rc4-fix' of git://neil.brown.name/md:
crash in md-raid1 and md-raid10 due to incorrect list manipulation
Matt Fleming [Sat, 10 Oct 2015 16:22:16 +0000 (17:22 +0100)]
MAINTAINERS: Change Matt Fleming's email address
My Intel email address will soon expire. Replace it with my
personal address so people still know where to send patches.
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1444494136-10333-1-git-send-email-matt@codeblueprint.co.uk
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Linus Torvalds [Sat, 10 Oct 2015 18:17:45 +0000 (11:17 -0700)]
Merge tag 'usb-4.3-rc5' of git://git./linux/kernel/git/gregkh/usb
Pull USB fixes from Greg KH:
"Here are some small USB and PHY fixes and quirk updates for 4.3-rc5.
Nothing major here, full details in the shortlog, and all of these
have been in linux-next for a while"
* tag 'usb-4.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
usb: Add device quirk for Logitech PTZ cameras
USB: chaoskey read offset bug
USB: Add reset-resume quirk for two Plantronics usb headphones.
usb: renesas_usbhs: Add support for R-Car H3
usb: renesas_usbhs: fix build warning if 64-bit architecture
usb: gadget: bdc: fix memory leak
phy: berlin-sata: Fix module autoload for OF platform driver
phy: rockchip-usb: power down phy when rockchip phy probe
phy: qcom-ufs: fix build error when the component is built as a module
Linus Torvalds [Sat, 10 Oct 2015 18:09:55 +0000 (11:09 -0700)]
Merge tag 'tty-4.3-rc5' of git://git./linux/kernel/git/gregkh/tty
Pull tty/serial driver fixes from Greg KH:
"Here are a few bug fixes for the tty core that resolve reported
issues, and some serial driver fixes as well (including the
much-reported imx driver problem)
All of these have been in linux-next with no reported problems"
* tag 'tty-4.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
drivers/tty: require read access for controlling terminal
serial: 8250: add uart_config entry for PORT_RT2880
tty: fix data race on tty_buffer.commit
tty: fix data race in tty_buffer_flush
tty: fix data race in flush_to_ldisc
tty: fix stall caused by missing memory barrier in drivers/tty/n_tty.c
serial: atmel: fix error path of probe function
tty: don't leak cdev in tty_cdev_add()
Revert "serial: imx: remove unbalanced clk_prepare"
Linus Torvalds [Sat, 10 Oct 2015 18:03:31 +0000 (11:03 -0700)]
Merge tag 'staging-4.3-rc5' of git://git./linux/kernel/git/gregkh/staging
Pull staging fixes from Greg KH:
"Here are two tiny staging tree fixes for 4.3-rc5.
One fixes the broken speakup subsystem as reported by a user, and the
other removes an entry in the MAINTAINERS file for a developer that
doesn't want to be listed anymore"
* tag 'staging-4.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
staging: speakup: fix speakup-r regression
MAINTAINERS: Remove myself as nvec co-maintainer
Linus Torvalds [Sat, 10 Oct 2015 17:58:27 +0000 (10:58 -0700)]
Merge tag 'char-misc-4.3-rc5' of git://git./linux/kernel/git/gregkh/char-misc
Pull char/misc driver fixes from Greg KH:
"Here are some small fixes for some misc drivers that resolve some
reported issues. All of these have been linux-next for a while"
* tag 'char-misc-4.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
mcb: Fix error handling in mcb_pci_probe()
mei: hbm: fix error in state check logic
nvmem: sunxi: Check for memory allocation failure
nvmem: core: Fix memory leak in nvmem_cell_write
nvmem: core: Handle shift bits in-place if cell->nbits is non-zero
nvmem: core: fix the out-of-range leak in read/write()
Linus Torvalds [Sat, 10 Oct 2015 17:51:55 +0000 (10:51 -0700)]
Merge git://git.linux-mips.org/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle:
- MIPS didn't define the new ioremap_uc. Defined it as an alias for
ioremap_uncached.
- Replace workaround for MIPS16 build issue with a correct one.
* git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: Define ioremap_uc
MIPS: UAPI: Ignore __arch_swab{16,32,64} when using MIPS16
Revert "MIPS: UAPI: Fix unrecognized opcode WSBH/DSBH/DSHD when using MIPS16."
Linus Torvalds [Sat, 10 Oct 2015 17:31:13 +0000 (10:31 -0700)]
Merge branch 'stable/for-linus-4.3' of git://git./linux/kernel/git/konrad/swiotlb
Pull swiotlb fixlet from Konrad Rzeszutek Wilk:
"Enable the SWIOTLB under 32-bit PAE kernels.
Nowadays most distros enable this due to CONFIG_HYPERVISOR|XEN=y which
select SWIOTLB. But for those that are not interested in
virtualization and wanting to use 32-bit PAE kernels and wanting to
have working DMA operations - this configures it for them"
* 'stable/for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
swiotlb: Enable it under x86 PAE
Trond Myklebust [Fri, 9 Oct 2015 17:44:34 +0000 (13:44 -0400)]
namei: results of d_is_negative() should be checked after dentry revalidation
Leandro Awa writes:
"After switching to version 4.1.6, our parallelized and distributed
workflows now fail consistently with errors of the form:
T34: ./regex.c:39:22: error: config.h: No such file or directory
From our 'git bisect' testing, the following commit appears to be the
possible cause of the behavior we've been seeing: commit
766c4cbfacd8"
Al Viro says:
"What happens is that
766c4cbfacd8 got the things subtly wrong.
We used to treat d_is_negative() after lookup_fast() as "fall with
ENOENT". That was wrong - checking ->d_flags outside of ->d_seq
protection is unreliable and failing with hard error on what should've
fallen back to non-RCU pathname resolution is a bug.
Unfortunately, we'd pulled the test too far up and ran afoul of
another kind of staleness. The dentry might have been absolutely
stable from the RCU point of view (and we might be on UP, etc), but
stale from the remote fs point of view. If ->d_revalidate() returns
"it's actually stale", dentry gets thrown away and the original code
wouldn't even have looked at its ->d_flags.
What we need is to check ->d_flags where
766c4cbfacd8 does (prior to
->d_seq validation) but only use the result in cases where we do not
discard this dentry outright"
Reported-by: Leandro Awa <lawa@nvidia.com>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=104911
Fixes:
766c4cbfacd8 ("namei: d_is_negative() should be checked...")
Tested-by: Leandro Awa <lawa@nvidia.com>
Cc: stable@vger.kernel.org # v4.1+
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>