Chase Southwood [Mon, 18 Aug 2014 03:43:02 +0000 (22:43 -0500)]
staging: comedi: dt2801: change function return type to void
cppcheck was complaining that the variable 'stat' is being reassigned
before the old value is used. Upon inspection, I found that
dt2801_writecmd() cannot fail, always returns 0, and most callers already
do not bother with assigning its return value anyway, so it makes sense to
just change the return type for this function from int to void, and remove
the two assignments to 'stat'.
Signed-off-by: Chase Southwood <chase.southwood@gmail.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Cc: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Chase Southwood [Sun, 17 Aug 2014 04:26:11 +0000 (23:26 -0500)]
staging: comedi: dt3000: remove unneeded variable
Coccinelle (using scripts/coccinelle/tests/doublebitand.cocci) found this
assignment because 0 is or'd twice. Upon inspection, I found that the
variable "mode" is only assigned once and used once, and thus can be
cleanly removed. This patch plugs its value straight into writew() and
then removes the variable.
Signed-off-by: Chase Southwood <chase.southwood@gmail.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Cc: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Chase Southwood [Sun, 17 Aug 2014 04:25:51 +0000 (23:25 -0500)]
staging: comedi: addi_apci_1564: correct typo in macro definition
A recent commit introduced a typo in the definition of
APCI1564_DO_CC_INT_DISABLE. The macro is not use yet, so not a huge deal,
but this patch corrects it.
Signed-off-by: Chase Southwood <chase.southwood@gmail.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Cc: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Chase Southwood [Sun, 17 Aug 2014 04:25:16 +0000 (23:25 -0500)]
staging: comedi: addi_apci_1564: add whitespace to subdevice init
For purely aesthetic purposes, add some whitespace to subdevice initialization.
Signed-off-by: Chase Southwood <chase.southwood@gmail.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Cc: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Eli Billauer [Sat, 16 Aug 2014 15:58:01 +0000 (18:58 +0300)]
staging: xillybus: Removed read barrier at beginning of ISR
The comment (also removed) explains why it was there in the first place, but
that doesn't make much sense.
Signed-off-by: Eli Billauer <eli.billauer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Eli Billauer [Sat, 16 Aug 2014 15:58:00 +0000 (18:58 +0300)]
staging: xillybus: Removed unnecessary smp_wmb()
These memory barriers were added "just to be safe".
Signed-off-by: Eli Billauer <eli.billauer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Eli Billauer [Sat, 16 Aug 2014 15:57:59 +0000 (18:57 +0300)]
staging: xillybus: Removed write memory barriers before wait_event_*()
According to Documentation/memory-barriers.txt, a memory barrier is put
in place by wait_event_*()
Signed-off-by: Eli Billauer <eli.billauer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Eli Billauer [Sat, 16 Aug 2014 15:57:58 +0000 (18:57 +0300)]
staging: xillybus: Removed mmiowb() as iowrite32() is ordered
mmiowb() was used to make sure that iowrite32() take place in the correct
order, which is an unnecessary precuation.
Signed-off-by: Eli Billauer <eli.billauer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Eli Billauer [Sat, 16 Aug 2014 15:57:57 +0000 (18:57 +0300)]
staging: xillybus: Removed mmiowb() before mutex_unlock()
The relevant sequences consist of two I/O memory writes. The second write
depends on the first one. mmiowb() was inserted to make sure that no other
thread inserts a "first write" before the current one finished its second.
As a mutex protects this critical sequence, mmiowb() is unnecessary.
Signed-off-by: Eli Billauer <eli.billauer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Eli Billauer [Sat, 16 Aug 2014 15:57:56 +0000 (18:57 +0300)]
staging: xillybus: Remove mmiowb() before wait_event_*() calls
According to Documentation/memory-barriers.txt, a memory barrier is put
in place by wait_event_*()
Signed-off-by: Eli Billauer <eli.billauer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Greg Kroah-Hartman [Sat, 30 Aug 2014 20:10:25 +0000 (13:10 -0700)]
staging: remove nokia_hp4p driver
The Bluetooth maintainer has been complaining about it for a while, and
I shouldn't have merged it over his objections. There also has been no
real work done on it at all to get it out of the staging tree, so just
delete the code for now.
If someone wants to get this fixed up properly, feel free to revert this
commit and send the revert, along with cleanups and we will be glad to
consider it.
Cc: Marcel Holtmann <marcel@holtmann.org>
Cc: Pali Rohár <pali.rohar@gmail.com>
Cc: Pavel Machek <pavel@ucw.cz>,
Cc: Miguel Oliveira <cmroliv@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Andrew Plummer [Fri, 29 Aug 2014 20:50:16 +0000 (21:50 +0100)]
Staging: bcm: LeakyBucket: format kernel-docs
Remove insignificant spaces before tabs in comments.
Signed-off-by: Andrew Plummer <plummer574@gmail.com>
Reviewed-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 11:03:29 +0000 (13:03 +0200)]
Staging: bcm: Bcmnet.c: Renamed variable: "IntfAdapter" -> "intf_ad"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 11:03:31 +0000 (13:03 +0200)]
Staging: bcm: Bcmnet.c: Renamed variable: "psIntfAdapter" -> "intf_ad"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 11:03:30 +0000 (13:03 +0200)]
Staging: bcm: Bcmnet.c: Renamed variable: "Adapter" -> "ad"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:58:15 +0000 (12:58 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "NOB" -> "nob"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:58:14 +0000 (12:58 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "pTarang" -> "tarang"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:58:13 +0000 (12:58 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "stTimeElapsedSinceNetEntry" -> "time_elapsed_since_net_entry"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:58:12 +0000 (12:58 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "DevInfo" -> "dev_info"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:58:11 +0000 (12:58 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "RxCntrlMsgBitMask" -> "rx_cntrl_msg_bit_mask"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:58:10 +0000 (12:58 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "ReadOffset" -> "read_offset"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:58:09 +0000 (12:58 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "stNVMRead" -> "nvm_read"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:58:08 +0000 (12:58 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "SectOfset" -> "sect_offset"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:58:07 +0000 (12:58 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "sCopySectStrut" -> "copy_sect_strut"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:58:06 +0000 (12:58 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "eFlash2xSectionVal" -> "flash_2x_section_val"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:58:05 +0000 (12:58 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "psFlash2xBitMap" -> "flash_2x_bit_map"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:58:04 +0000 (12:58 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "WriteOffset" -> "write_off"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:58:03 +0000 (12:58 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "InputAddr" -> "input_addr"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:58:02 +0000 (12:58 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "pWriteBuff" -> "write_buff"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:58:01 +0000 (12:58 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "WriteBytes" -> "write_bytes"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:58:00 +0000 (12:58 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "ReadBytes" -> "read_bytes"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:57:59 +0000 (12:57 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "BuffSize" -> "buff_size"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:57:58 +0000 (12:57 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "pReadBuff" -> "read_buff"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:57:57 +0000 (12:57 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "sFlash2xRead" -> "flash_2x_read"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:57:56 +0000 (12:57 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "pReadData" -> "read_data"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:57:55 +0000 (12:57 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "stNVMReadWrite" -> "nvm_rw"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:57:54 +0000 (12:57 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "sUserDebugState" -> "user_debug_state"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:57:53 +0000 (12:57 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "uiSectorSize" -> "sector_size"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:57:52 +0000 (12:57 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "uiTempVar" -> "tmp"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:57:51 +0000 (12:57 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "pBulkBuffer" -> "bulk_buff"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:57:50 +0000 (12:57 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "uiData" -> "data"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:57:49 +0000 (12:57 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "uiLoopIndex" -> "i"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:57:48 +0000 (12:57 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "NVMAccess" -> "nvm_access"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:57:47 +0000 (12:57 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "psFwInfo" -> "fw_info"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:57:46 +0000 (12:57 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "ulSFId" -> "sf_id"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:57:45 +0000 (12:57 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "pvBuffer" -> "buff"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:57:44 +0000 (12:57 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "ucResetValue" -> "reset_val"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:57:43 +0000 (12:57 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "Status" -> "status"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:57:42 +0000 (12:57 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "ucRead" -> "read"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:57:41 +0000 (12:57 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "uiBit" -> "bit"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:57:40 +0000 (12:57 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "IoBuffer" -> "io_buff"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:57:39 +0000 (12:57 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "threadReq" -> "thread_req"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Wed, 27 Aug 2014 10:57:38 +0000 (12:57 +0200)]
Staging: bcm: Bcmchar.c: Renamed variable: "Adapter" -> "ad"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matthias Beyer [Mon, 18 Aug 2014 10:38:31 +0000 (12:38 +0200)]
Staging: bcm: Bcmchar.c: Fixed debug output
The output prints some struct variable contents, but uses a wrong
variable name. This is fixed by this patch.
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Marco Cyriacks [Fri, 22 Aug 2014 20:08:06 +0000 (22:08 +0200)]
staging: lustre: socklnd: Remove static initialization to NULL or 0
This patch fixes the following coding style issue:
ERROR: do not initialise statics to 0 or NULL
Signed-off-by: Marco Cyriacks <marco@cyriacks.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Julia Lawall [Sat, 30 Aug 2014 14:41:23 +0000 (16:41 +0200)]
staging: lustre: fid,fld: expand the GOTO macro
The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@@
identifier lbl;
identifier rc;
constant c;
@@
- GOTO(lbl,\(rc\|c\));
+ goto lbl;
@@
identifier lbl;
expression rc;
@@
- GOTO(lbl,rc);
+ rc;
+ goto lbl;
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Julia Lawall [Sat, 30 Aug 2014 14:24:55 +0000 (16:24 +0200)]
staging: lustre: llite: expand the GOTO macro
The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@@
identifier lbl;
@@
if (...)
GOTO(lbl,...);
+else
GOTO(lbl,...);
@@
identifier lbl,rc;
constant c;
expression e,e1;
@@
if (
- e
+ !e
)
- GOTO(lbl,\(rc\|c\));
-else GOTO(lbl,e1);
+ e1;
+goto lbl;
@@
identifier lbl,rc;
constant c;
expression e,e1;
@@
if (e)
- GOTO(lbl,e1);
-else GOTO(lbl,\(rc\|c\));
+ e1;
+goto lbl;
@@
identifier lbl;
expression e,e1,e2;
@@
if (e)
- GOTO(lbl,e1);
-else GOTO(lbl,e2);
+ e1;
+else e2;
+goto lbl;
// ------------------------------------------------------------------------
@@
identifier lbl,rc;
constant c;
@@
- GOTO(lbl,\(rc\|c\));
+ goto lbl;
@@
identifier lbl;
expression rc;
@@
- GOTO(lbl,rc);
+ rc;
+ goto lbl;
// </smpl>
The rules above the line deal with the case where the goto desination is
the same whether or not the the branch is taken. In that case, the goto is
created in just one instance after the if. This affects only the files
namei.c and llite_lib.c.
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Janet Liu [Sat, 30 Aug 2014 06:59:04 +0000 (14:59 +0800)]
staging:lustre:lnet lib-md.c erase space before ')' for code style
Silences the following error:
ERROR: space prohibited before that close parenthesis ')'
Signed-off-by: Janet Liu <jianhua.ljh@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Janet Liu [Sat, 30 Aug 2014 06:56:09 +0000 (14:56 +0800)]
staging:lustre:lnet: lib-md.c delete space before '(' for code style
Silences the following checkpatch warning:
WARNING: space prohibited between function name and open parenthesis '('
Signed-off-by: Janet Liu <jianhua.ljh@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
John L. Hammond [Thu, 28 Aug 2014 23:35:19 +0000 (18:35 -0500)]
staging/lustre: remove linux/obd_support.h
Remove the superfluous header lustre/include/linux/obd_support.h.
Signed-off-by: John L. Hammond <john.hammond@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
John L. Hammond [Thu, 28 Aug 2014 23:35:18 +0000 (18:35 -0500)]
staging/lustre: remove linux/obd_class.h
Kill the macro ll_inode_flags() and remove the superfluous header
lustre/include/linux/obd_class.h.
Signed-off-by: John L. Hammond <john.hammond@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
John L. Hammond [Thu, 28 Aug 2014 23:35:17 +0000 (18:35 -0500)]
staging/lustre: remove linux/lustre_quota.h
Remove the superfluous header lustre/include/linux/lustre_quota.h.
Signed-off-by: John L. Hammond <john.hammond@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
John L. Hammond [Thu, 28 Aug 2014 23:35:16 +0000 (18:35 -0500)]
staging/lustre: remove linux/lustre_net.h
Remove the superfluous header lustre/include/linux/lustre_net.h.
Signed-off-by: John L. Hammond <john.hammond@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
John L. Hammond [Thu, 28 Aug 2014 23:35:15 +0000 (18:35 -0500)]
staging/lustre: remove linux/lustre_log.h
Remove the superfluous header lustre/include/linux/lustre_log.h.
Signed-off-by: John L. Hammond <john.hammond@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
John L. Hammond [Thu, 28 Aug 2014 23:35:14 +0000 (18:35 -0500)]
staging/lustre: remove linux/lustre_lib.h
Inline the only call to inode_init_lvb(). Move some definitions from
lustre/include/linux/lustre_lib.h to lustre/include/lustre_lib.h and
remove the first header.
Signed-off-by: John L. Hammond <john.hammond@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
John L. Hammond [Thu, 28 Aug 2014 23:35:13 +0000 (18:35 -0500)]
staging/lustre: move lustre_intent.h to ..
Move lustre/include/linux/lustre_intent.h to lustre/include.
Signed-off-by: John L. Hammond <john.hammond@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
John L. Hammond [Thu, 28 Aug 2014 23:35:12 +0000 (18:35 -0500)]
staging/lustre: remove linux/lustre_handles.h
Remove lustre/include/linux/lustre_acl.h and kill the cfs_rcu_head_t
typedef.
Signed-off-by: John L. Hammond <john.hammond@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
John L. Hammond [Thu, 28 Aug 2014 23:35:11 +0000 (18:35 -0500)]
staging/lustre: remove linux/lustre_dlm.h
Remove the superfluous header lustre/include/linux/lustre_dlm.h.
Signed-off-by: John L. Hammond <john.hammond@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
John L. Hammond [Thu, 28 Aug 2014 23:35:10 +0000 (18:35 -0500)]
staging/lustre remove linux/lustre_acl.h
Move the contents of lustre/include/linux/lustre_acl.h to
lustre/include/lustre_acl.h and remove the first header.
Signed-off-by: John L. Hammond <john.hammond@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
John L. Hammond [Thu, 28 Aug 2014 23:35:09 +0000 (18:35 -0500)]
staging/lustre: remove linux/lprocfs_status.h
Remove lustre/include/linux/lprocfs_status.h. Include linux/statfs.h
where needed.
Signed-off-by: John L. Hammond <john.hammond@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Mario Schlegel [Thu, 28 Aug 2014 19:54:18 +0000 (21:54 +0200)]
staging: lustre: osc: add blank line after declarations
fixed a coding style issue
Signed-off-by: Mario Schlegel <m.schlegel@posteo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleg Drokin [Thu, 28 Aug 2014 18:54:23 +0000 (14:54 -0400)]
staging/lustre: remove unused request policies.
Client policies do not make much sense to have in client-only code,
so remove all references to everything but fifo.
This also removes lustre/libcfs/heap.c and its header, since it was
only used by certain request policies (crr and orr).
Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleg Drokin [Thu, 28 Aug 2014 18:54:22 +0000 (14:54 -0400)]
staging/lustre/obdclass: remove unused file linkea.c
Also unused header file lustre_linkea.h
Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleg Drokin [Thu, 28 Aug 2014 18:54:21 +0000 (14:54 -0400)]
staging/lustre/obdclass: remove unused file llog_lvfs.c
This contains server-side llog operations.
Also remove declaration of public structure from lustre_log.h
Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleg Drokin [Thu, 28 Aug 2014 18:54:20 +0000 (14:54 -0400)]
staging/lustre/obdclass: remove unused file md_attrs.c
It's only used by server side luster for on-disk structure swabbing.
And also remove forward declarations for its functions from
md_object.h and lustre_idl.h
Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Julia Lawall [Thu, 28 Aug 2014 18:03:37 +0000 (20:03 +0200)]
staging: lustre: mgc: expand the GOTO macro
The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@@
identifier lbl;
identifier rc;
constant c;
@@
- GOTO(lbl,\(rc\|c\));
+ goto lbl;
@@
identifier lbl;
expression rc;
@@
- GOTO(lbl,rc);
+ rc;
+ goto lbl;
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Julia Lawall [Thu, 28 Aug 2014 17:47:00 +0000 (19:47 +0200)]
staging: lustre: mgc: remove unused file
This file contains unresolved references and is not mentioned in the
Makefile.
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Julia Lawall [Thu, 28 Aug 2014 17:42:45 +0000 (19:42 +0200)]
staging: lustre: obdech: remove unused file
This file contains unresolved references and is not mentioned in the
Makefile.
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Julia Lawall [Thu, 28 Aug 2014 10:10:35 +0000 (12:10 +0200)]
staging: lustre: mdc: expand the GOTO macro
The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@@
identifier lbl;
identifier rc;
constant c;
@@
- GOTO(lbl,\(rc\|c\));
+ goto lbl;
@@
identifier lbl;
expression rc;
@@
- GOTO(lbl,rc);
+ rc;
+ goto lbl;
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Julia Lawall [Wed, 27 Aug 2014 21:01:34 +0000 (23:01 +0200)]
staging: lustre: lmv: expand the GOTO macro
The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@@
identifier lbl;
identifier rc;
constant c;
@@
- GOTO(lbl,\(rc\|c\));
+ goto lbl;
@@
identifier lbl;
expression rc;
@@
- GOTO(lbl,rc);
+ rc;
+ goto lbl;
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Julia Lawall [Tue, 26 Aug 2014 20:00:33 +0000 (22:00 +0200)]
staging: lustre: remove parentheses from return arguments
The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@@
identifier i;
constant c;
@@
return
- (
\(i\|-i\|i(...)\|c\)
- )
;
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Greg Donald [Tue, 26 Aug 2014 01:07:19 +0000 (20:07 -0500)]
drivers: staging: lustre: Fix space required after that ',' errors
Fix checkpatch.pl space required after that ',' errors
Signed-off-by: Greg Donald <gdonald@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Julia Lawall [Sat, 23 Aug 2014 11:20:27 +0000 (13:20 +0200)]
lustre: obdclass: use c99 initializers in structures
Use c99 initializers for structures.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@decl@
identifier i1,fld;
type T;
field list[n] fs;
@@
struct i1 {
fs
T fld;
...};
@bad@
identifier decl.i1,i2;
expression e;
initializer list[decl.n] is;
@@
struct i1 i2 = { is,
+ .fld = e
- e
,...};
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Greg Donald [Fri, 22 Aug 2014 14:06:15 +0000 (09:06 -0500)]
drivers: staging: lustre: Fix that open brace { should be on the previous line errors
Fix checkpatch.pl that open brace { should be on the previous line errors
Signed-off-by: Greg Donald <gdonald@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Greg Donald [Thu, 21 Aug 2014 17:40:35 +0000 (12:40 -0500)]
drivers: staging: lustre: Fix space required before the open parenthesis '(' errors
Fix checkpatch.pl space required before the open parenthesis '(' errors
Signed-off-by: Greg Donald <gdonald@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Greg Donald [Thu, 21 Aug 2014 16:07:42 +0000 (11:07 -0500)]
drivers: staging: lustre: lustre: Fix "foo * bar" should be "foo *bar" errors
Fix checkpatch.pl "foo * bar" should be "foo *bar" errors
Signed-off-by: Greg Donald <gdonald@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Hema Prathaban [Tue, 19 Aug 2014 19:26:28 +0000 (00:56 +0530)]
staging: lustre: lustre: ptlrpc: Placing inline keyword
This patch fixes the following error using checkpatch.pl
ERROR: inline keyword should sit between storage class and type
Signed-off-by: Hema Prathaban <hemaklnce@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Phong Tran [Tue, 19 Aug 2014 15:45:50 +0000 (22:45 +0700)]
staging: lustre: lnet: socklnd_cb.c Fix sparse non-static symbol warning
This patch fixes some non static function declarations that
cause sparse warning. Tested by compilation.
Signed-off-by: Phong Tran <tranmanphong@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleg Drokin [Sun, 17 Aug 2014 17:13:51 +0000 (13:13 -0400)]
lustre: Add some basic documentation
This adds drivers/staging/lustre/README.txt with some
basic information about Lustre and how to use it.
Eventually this will need to move to Documentation/filesystems/lustre.txt
Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Oleg Drokin [Fri, 15 Aug 2014 16:48:14 +0000 (12:48 -0400)]
lustre: Add MAINTAINERS entry
Just add the entry with some info.
Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Andrew Morton [Mon, 25 Aug 2014 23:32:20 +0000 (16:32 -0700)]
drivers/staging/unisys: fix build
drivers/staging/unisys/visorchipset/file.c:31: error: redefinition of typedef 'GUEST_PHYSICAL_ADDRESS'
drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h:23: note: previous declaration of 'GUEST_PHYSICAL_ADDRESS' was here
Cc: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Honggang Li [Tue, 19 Aug 2014 11:29:43 +0000 (19:29 +0800)]
staging: unisys/virthba/virthba.c print u64 with %llu
drivers/staging/unisys/virthba/virthba.c:520:2: warning: format ‘%u’
expects argument of type ‘unsigned int’, but argument 4 has type ‘u64’
[-Wformat=]
drivers/staging/unisys/virthba/virthba.c:749:2: warning: format ‘%d’
expects argument of type ‘int’, but argument 5 has type ‘u64’
[-Wformat=]
drivers/staging/unisys/virthba/virthba.c:1142:4: warning: format ‘%d’
expects argument of type ‘int’, but argument 7 has type ‘u64’
[-Wformat=]
drivers/staging/unisys/virthba/virthba.c:1151:5: warning: format ‘%d’
expects argument of type ‘int’, but argument 5 has type ‘u64’
[-Wformat=]
After apply the patch:
linux-next]$ make C=1 drivers/staging/unisys/virthba/virthba.o
CHK include/config/kernel.release
CHK include/generated/uapi/linux/version.h
CHK include/generated/utsrelease.h
CALL scripts/checksyscalls.sh
CHECK drivers/staging/unisys/virthba/virthba.c
CC [M] drivers/staging/unisys/virthba/virthba.o
Signed-off-by: Honggang Li <enjoymindful@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Mon, 18 Aug 2014 13:34:54 +0000 (09:34 -0400)]
staging: unisys: remove generally useless elses from visorchipset_main.c
There are several else clauses that aren't necessary listed by checkpatch.pl in
visorchipset_main.c. Remove these.
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Mon, 18 Aug 2014 13:34:53 +0000 (09:34 -0400)]
staging: unisys: fix spacing in visorchipset_main.c
Fix the missing blank lines between declarations and code in
visorchipset_main.c.
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Mon, 18 Aug 2014 13:34:52 +0000 (09:34 -0400)]
staging: unisys: fix spacing in parser.c
Fix the two spacing errors in parser.c.
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Mon, 18 Aug 2014 13:34:51 +0000 (09:34 -0400)]
staging: unisys: fix spacing in file.c
There's a missing blank line between code and declarations in file.c.
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Mon, 18 Aug 2014 13:29:47 +0000 (09:29 -0400)]
staging: unisys: fix indentation of uisutil_copy_fragsinfo_from_skb()
The function uisutil_copy_fragsinfo_from_skb() in uisutils.c is messy and
over-indented. This patch fixes the function's indentation so it is cleaner.
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Mon, 18 Aug 2014 13:29:46 +0000 (09:29 -0400)]
staging: unisys: fix spacing in uisthread.c
Fix the missing blank line between code and declarations in uisthread.c.
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Mon, 18 Aug 2014 13:29:45 +0000 (09:29 -0400)]
staging: unisys: remove void return from uislib_mod_exit()
Remove the extraneous return from the uislib module exit function.
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Benjamin Romer [Mon, 18 Aug 2014 13:29:44 +0000 (09:29 -0400)]
staging: unisys: simplify destroy_bus() in uislib.c
The destroy_bus() function is heavily indented and many lines extend past the
right margin. This patch simplifies the function without changing its effects.
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>