openwrt/staging/blogic.git
10 years agostaging: ft1000-pcmcia: Don't initialise static to 0
Catalina Mocanu [Tue, 23 Sep 2014 19:52:33 +0000 (12:52 -0700)]
staging: ft1000-pcmcia: Don't initialise static to 0

This fixes the following checkpatch.pl error:
ERROR: do not initialise statics to 0 or NULL

Signed-off-by: Catalina Mocanu <catalina.mocanu@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8712: fixed missing blank line
Sarah Khan [Tue, 23 Sep 2014 21:35:16 +0000 (03:05 +0530)]
staging: rtl8712: fixed missing blank line

WARNING : Missing a blank line after declaration
checkpatch.pl warning in hal_init.c

Signed-off-by: Sarah Khan <sarahjmi07@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: media: omap24xx: Fix else is not useful warning
Mahati Chamarthy [Tue, 23 Sep 2014 16:39:23 +0000 (22:09 +0530)]
Staging: media: omap24xx: Fix else is not useful warning

This fixes the following checkpatch.pl warning:
WARNING: else is not generally useful after a break or return

Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8192e: rtl8192e: Merge two lines and remove unused variable
Mahati Chamarthy [Tue, 23 Sep 2014 15:43:36 +0000 (21:13 +0530)]
Staging: rtl8192e: rtl8192e: Merge two lines and remove unused variable

This patch merges an assignment with an immediately following return of
the assigned variable. It also removes variables that became unused due to this transformation.
The following Coccinelle semantic patch was used to make this transformation:

@r@
identifier ret;
identifier f;
@@

-ret =
+return
     f(...);
-return ret;

@@
identifier r.ret;
expression e1;
type t;
@@

(
-t ret = e1;
|
-t ret;
)
 ... when != ret
     when strict

Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8192u: remove unecessary variable
Tapasweni Pathak [Mon, 22 Sep 2014 16:52:36 +0000 (22:22 +0530)]
staging: rtl8192u: remove unecessary variable

This patch removes unncessary variable in file r8192U_core.c
using Coccinelle. Semantic patch for this is as follows :
@@
identifier ret;
@@

-int ret = 0;
 ... when != ret
     when strict
-return ret;
+return 0;

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: media: lirc: Merge two lines and remove unused variable
Mahati Chamarthy [Tue, 23 Sep 2014 15:54:47 +0000 (21:24 +0530)]
Staging: media: lirc: Merge two lines and remove unused variable

This patch merges an assignment with an immediately following return of
the assigned variable. It also removes a variable that becomes unused due to this transformation.
The following Coccinelle semantic patch was used to make this transformation:

@r@
identifier ret;
identifier f;
@@

-ret =
+return
     f(...);
-return ret;

@@
identifier r.ret;
expression e1;
type t;
@@

(
-t ret = e1;
|
-t ret;
)
 ... when != ret
     when strict

Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: dgnc: Replace non-standard spinlock's macros
Roberta Dobrescu [Mon, 22 Sep 2014 22:55:55 +0000 (01:55 +0300)]
staging: dgnc: Replace non-standard spinlock's macros

This patch replaces non-standard spinlock's macros.
It is done using coccinelle and the following semantic patch:

@@
expression x;
@@

- DGNC_SPINLOCK_INIT(x)
+ spin_lock_init(&x)

@@
expression x, y;
@@

- DGNC_LOCK(x, y)
+ spin_lock_irqsave(&x, y)

@@
expression x, y;
@@

- DGNC_UNLOCK(x, y)
+ spin_unlock_irqrestore(&x, y)

@used_by_lock exists@
typedef ulong;
symbol lock_flags;
position p1, p2;
@@

(
 ulong lock_flags@p1;
|
 unsigned long lock_flags@p2;
)
...
(
 spin_lock_irqsave(..., lock_flags)
|
 spin_unlock_irqrestore(..., lock_flags)
)

@@
position used_by_lock.p1, used_by_lock.p2;
@@

(
- ulong lock_flags@p1;
+ unsigned long flags;
|
- unsigned long lock_flags@p2;
+ unsigned long flags;
)
<...
- lock_flags
+ flags
...>

Signed-off-by: Roberta Dobrescu <roberta.dobrescu@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: ft1000-pcmcia: replace DEBUG macro with netdev_dbg
Catalina Mocanu [Mon, 22 Sep 2014 22:14:18 +0000 (15:14 -0700)]
staging: ft1000-pcmcia: replace DEBUG macro with netdev_dbg

This fixes the following checkpatch.pl warning:
WARNING: Prefer [subsystem eg: netdev]_dbg([subsystem]dev, ... then
dev_dbg(dev, ... then pr_debug(...  to printk(KERN_DEBUG ...

Removing the macro also fixes:
WARNING: macros should not use a trailing semicolon

Signed-off-by: Catalina Mocanu <catalina.mocanu@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: emxx_udc: Do not assign bool to 0/1
Roberta Dobrescu [Tue, 23 Sep 2014 08:37:02 +0000 (11:37 +0300)]
staging: emxx_udc: Do not assign bool to 0/1

This fixes the following coccinelle warning:
WARNING: Assignment of bool to 0/1

Signed-off-by: Roberta Dobrescu <roberta.dobrescu@gmail.com>
Acked-by: Daniel Baluta <daniel.baluta@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: emxx_udc: Do not use comparisons on bool tests
Roberta Dobrescu [Tue, 23 Sep 2014 08:36:37 +0000 (11:36 +0300)]
staging: emxx_udc: Do not use comparisons on bool tests

This fixes the following coccinelle warning:
WARNING: Comparison of bool to 0/1

Signed-off-by: Roberta Dobrescu <roberta.dobrescu@gmail.com>
Acked-by: Daniel Baluta <daniel.baluta@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: imx-drm: Fix line over 80 characters warning
Aybuke Ozdemir [Sun, 21 Sep 2014 16:40:21 +0000 (19:40 +0300)]
Staging: imx-drm: Fix line over 80 characters warning

Fix checkpatch.pl issues with
line over 80 characters in parallel-display.c

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: vme: devices: Merges two lines of code and removes unused variable
Mahati Chamarthy [Mon, 22 Sep 2014 17:34:13 +0000 (23:04 +0530)]
Staging: vme: devices: Merges two lines of code and removes unused variable

This patch merges an assignment with an immediately following return of
the assigned variable.  The following Coccinelle semantic patch was used
to make this transformation:

@@
expression ret;
identifier f;
@@

-ret =
+return
     f(...);
-return ret;

Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8192e: Fix else is not useful warning style
Mahati Chamarthy [Sun, 21 Sep 2014 19:51:48 +0000 (01:21 +0530)]
Staging: rtl8192e: Fix else is not useful warning style

This fixes the following checkpatch.pl warnings:
WARNING: else is not generally useful after a break or return

Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: core: add consistent spacing around '-'
Tapasweni Pathak [Sun, 21 Sep 2014 14:08:30 +0000 (19:38 +0530)]
staging: rtl8723au: core: add consistent spacing around '-'

This patch fixes checkpatch.pl error in file rtw_ap.c
ERROR: need consistent spacing around '-' (ctx:WxV)

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8192e: rtl8192e: Merges two lines of code and removes unused variable
Mahati Chamarthy [Sun, 21 Sep 2014 13:17:46 +0000 (18:47 +0530)]
Staging: rtl8192e: rtl8192e: Merges two lines of code and removes unused variable

This patch merges an assignment with an immediately following return of
the assigned variable. It also removes a variable that becomes unused due to this transformation.
The following Coccinelle semantic patch was used to make this transformation:

@@
expression ret;
identifier f;
@@

-ret =
+return
     f(...);
-return ret;

@@
identifier ret;
type t;
identifier c;
@@

-t ret = c;
 ... when != ret
     when strict

Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: bcm: Fix line over 80 characters.
Heena Sirwani [Mon, 22 Sep 2014 05:41:45 +0000 (11:11 +0530)]
Staging: bcm: Fix line over 80 characters.

The following patch fixes the checkpatch.pl warning:
WARNING: line over 80 characters

Signed-off-by: Heena Sirwani <heenasirwani@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: bcm: Remove unneeded else after return.
Heena Sirwani [Mon, 22 Sep 2014 10:14:01 +0000 (15:44 +0530)]
Staging: bcm: Remove unneeded else after return.

The following patch fixes the checkpatch.pl warning:
WARNING: else is generally not useful after a break or return.

Signed-off-by: Heena Sirwani <heenasirwani@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: bcm: remove space before tab
Tapasweni Pathak [Sun, 21 Sep 2014 09:45:06 +0000 (15:15 +0530)]
staging: bcm: remove space before tab

This patch fixes checkpatch.pl warning in headers.h file
WARNING : please, no space before tabs

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: bcm: fix error do not use c99 comments
Tapasweni Pathak [Sun, 21 Sep 2014 09:42:02 +0000 (15:12 +0530)]
staging: bcm: fix error do not use c99 comments

This patch fixes checkpatch.pl error in InterfaceMacros.h file
ERROR: do not use C99 // comments

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: ste_rmi4: add new line after declarations
Tapasweni Pathak [Sat, 20 Sep 2014 23:49:15 +0000 (05:19 +0530)]
Staging: ste_rmi4: add new line after declarations

This patch fixes checkpatch.pl warning in synaptics_i2c_rmi4.c file
WARNING : Missing a blank line after declarations

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: vt6656: Merge two lines of code into one
Rajbinder Brar [Tue, 23 Sep 2014 04:46:17 +0000 (10:16 +0530)]
Staging: vt6656: Merge two lines of code into one

This patch merges an assignment with an immediately following return of
the assigned variable. The following Coccinelle semantic patch was used
to make this transformation:

@@
expression ret;
identifier f;
@@

-ret=
+return
f(...);
-return ret;

A variable that became unused due to this transformation was also
removed.

Signed-off-by: Rajbinder Brar <brar.rajbinder@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6656: remove unnecessary else after return
Tapasweni Pathak [Mon, 22 Sep 2014 11:32:20 +0000 (17:02 +0530)]
staging: vt6656: remove unnecessary else after return

This patch fixes checkpatch.pl warning in files of vt6656
WARNING: else is not generally useful after a break or return

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6655: shift open brace '{' to previous line
Tapasweni Pathak [Mon, 22 Sep 2014 09:21:09 +0000 (14:51 +0530)]
staging: vt6655: shift open brace '{' to previous line

This patch fixes checkpatch.pl error in baseband.c file
ERROR : that open brace { should be on the previous line

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: vt6655: remove unnecessary else after return
Tapasweni Pathak [Mon, 22 Sep 2014 09:20:45 +0000 (14:50 +0530)]
staging: vt6655: remove unnecessary else after return

This patch fixes checkpatch.pl warning in aes_ccmp.c file
WARNING : else is not generally useful after a break or return

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: vt6656: Merges two lines of code and also removes unused variable
Mahati Chamarthy [Sun, 21 Sep 2014 15:24:52 +0000 (20:54 +0530)]
Staging: vt6656: Merges two lines of code and also removes unused variable

This patch merges an assignment with an immediately following return of
the assigned variable.  The following Coccinelle semantic patch was used
to make this transformation:

@@
expression ret;
identifier f;
@@

-ret =
+return
     f(...);
-return ret;

A variable that became unused due to this transformation was also removed.

Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: vt6656: Merges two lines of code and removes unused variable
Mahati Chamarthy [Sun, 21 Sep 2014 15:23:52 +0000 (20:53 +0530)]
Staging: vt6656: Merges two lines of code and removes unused variable

This patch merges an assignment with an immediately following return of
the assigned variable.The following Coccinelle semantic patch was used to make this transformation:

@@
expression ret;
identifier f;
@@

-ret =
+return
     f(...);
-return ret;

A variable that became unused due to this transformation was also removed.

Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: vt6655: Fix C99 style commenting.
Aybuke Ozdemir [Sun, 21 Sep 2014 00:26:35 +0000 (03:26 +0300)]
Staging: vt6655: Fix C99 style commenting.

This patch fixes these error messages found by checkpatch.pl:
ERROR: do not use C99 // comments

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: dgnc: Fix unnecessary braces warning.
Gulsah Kose [Sun, 21 Sep 2014 19:56:15 +0000 (22:56 +0300)]
staging: dgnc: Fix unnecessary braces warning.

Fixes "braces {} are not necessary for single statement blocks"
checkpatch.pl warnings in dgnc_sysfs.c

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: unisys: fix IO memory copy in channel.h
Benjamin Romer [Mon, 22 Sep 2014 17:45:03 +0000 (13:45 -0400)]
staging: unisys: fix IO memory copy in channel.h

The function ULTRA_check_channel_client() was recently patched to use
ioread8_rep(). Unfortunately the parameters were incorrectly ordered, and this
causes the function to fail and the guest to not boot.

This patch switches the parameters around and uses memcpy_fromio() instead,
which is clearer since a structure is being copied, not an array, and it
fixes the error message printout later in the function that was using the UUID
value in the channel, rather than the value copied from the channel, which
causes a misleading error to be reported.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: unisys: channels: Missing a blank line after declarations
Aybuke Ozdemir [Sun, 21 Sep 2014 18:24:00 +0000 (21:24 +0300)]
Staging: unisys: channels: Missing a blank line after declarations

This patch fixes these warning messages found by checkpatch.pl:
WARNING : Missing a blank line after declarations.

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Acked-by: Daniel Baluta <daniel.baluta@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: unisys: virthba: remove unnecessary return statement
Catalina Mocanu [Sat, 20 Sep 2014 18:00:40 +0000 (11:00 -0700)]
staging: unisys: virthba: remove unnecessary return statement

This fixes the following checkpatch.pl warning:
WARNING: void function return statements are not generally useful

Signed-off-by: Catalina Mocanu <catalina.mocanu@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: unisys: visorutil: remove unnecessary braces
Catalina Mocanu [Sat, 20 Sep 2014 16:39:07 +0000 (09:39 -0700)]
staging: unisys: visorutil: remove unnecessary braces

This fixes the following checkpatch.pl warning:
WARNING: braces {} are not necessary for single statement blocks

Signed-off-by: Catalina Mocanu <catalina.mocanu@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: iio: light: Use usleep_range instead of msleep
Vaishali Thakkar [Tue, 23 Sep 2014 03:52:30 +0000 (09:22 +0530)]
Staging: iio: light: Use usleep_range instead of msleep

This patch fixes following checkpatch.pl warning:

WARNING: msleep < 20ms can sleep for up to 20ms; see Documentation/timers/timers-howto.txt

Signed-off-by: Vaishali Thakkar <vthakkar1994@gmail.com>
Acked-by: Daniel Baluta <daniel.baluta@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: speakup: remove jiffies comparison using time_after_eq()
Tapasweni Pathak [Sun, 21 Sep 2014 13:52:51 +0000 (19:22 +0530)]
staging: speakup: remove jiffies comparison using time_after_eq()

This patch fixes checkpatch.pl warning in files of speakup
WARNING : Comparing jiffies is almost always wrong; prefer time_after,
time_before and friends

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8192ee: Remove unnecessary return statement
Erin Grasmick [Mon, 22 Sep 2014 22:07:51 +0000 (17:07 -0500)]
staging: rtl8192ee: Remove unnecessary return statement

Removes void function return statements.

Signed-off-by: Erin Grasmick <ecg@unseen.is>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8192ee: Add blank lines after declarations
Erin Grasmick [Mon, 22 Sep 2014 22:07:50 +0000 (17:07 -0500)]
staging: rtl8192ee: Add blank lines after declarations

Signed-off-by: Erin Grasmick <ecg@unseen.is>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8192ee: Missing a blank line after declarations
Aybuke Ozdemir [Sat, 20 Sep 2014 22:35:39 +0000 (01:35 +0300)]
Staging: rtl8192ee: Missing a blank line after declarations

This patch fixes these warning messages found by checkpatch.pl:
WARNING : Missing a blank line after declarations.

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8192ee: Fix unnecessary return at end of function.
Erin Grasmick [Sat, 20 Sep 2014 14:28:06 +0000 (09:28 -0500)]
staging: rtl8192ee: Fix unnecessary return at end of function.

Fix for unnecessary return at end of function as diagnosed by checkpatch.pl.

Signed-off-by: Erin Grasmick <ecg@unseen.is>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rts5208: add new line after declarations
Roxana Blaj [Sun, 21 Sep 2014 10:32:32 +0000 (13:32 +0300)]
staging: rts5208: add new line after declarations

This fixes the warning:
WARNING: Missing a blank line after declarations

Signed-off-by: Roxana Blaj <roxanagabriela10@gmail.com>
Acked-by: Daniel Baluta <daniel.baluta@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rts5208: Fix checkpatch warning: Missing blank line
Tina Johnson [Sun, 21 Sep 2014 06:08:11 +0000 (11:38 +0530)]
Staging: rts5208: Fix checkpatch warning: Missing blank line

The following checkpatch warning was fixed :

WARNING: Missing a blank line after declarations

Signed-off-by: Tina Johnson <tinajohnson.1234@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rts5208: remove unnecessary return statement
Roxana Blaj [Sat, 20 Sep 2014 14:21:40 +0000 (17:21 +0300)]
staging: rts5208: remove unnecessary return statement

This fixes the warning:
WARNING: void function return statements are not generally useful

Signed-off-by: Roxana Blaj <roxanagabriela10@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rts5208: remove unnecessary else
Roxana Blaj [Sat, 20 Sep 2014 14:21:04 +0000 (17:21 +0300)]
staging: rts5208: remove unnecessary else

This fixes the warning:
WARNING: else is not generally useful after a break or return

Signed-off-by: Roxana Blaj <roxanagabriela10@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8821ae: Fixes unnecessary return warning.
Gulsah Kose [Sun, 21 Sep 2014 13:44:49 +0000 (16:44 +0300)]
staging: rtl8821ae: Fixes unnecessary return warning.

This patch fixes "void function return statements are not generally
useful" checkpatch.pl warning in base.c

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Acked-by: Daniel Baluta <daniel.baluta@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: et131x: Remove TODO item regarding split lines
Mark Einon [Mon, 22 Sep 2014 19:58:17 +0000 (20:58 +0100)]
staging: et131x: Remove TODO item regarding split lines

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: et131x: Reduce split lines by renaming flowcontrol
Mark Einon [Mon, 22 Sep 2014 19:58:16 +0000 (20:58 +0100)]
staging: et131x: Reduce split lines by renaming flowcontrol

Rename adapter->flowcontrol to adapter->flow, reducing split lines.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: et131x: Use braces on all arms of if/else in et131x_handle_recv_pkts
Mark Einon [Mon, 22 Sep 2014 19:58:15 +0000 (20:58 +0100)]
staging: et131x: Use braces on all arms of if/else in et131x_handle_recv_pkts

The 'if' blocks have braces, so the 'else' blocks should too.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: et131x: Reduce split lines by renaming some psr variables
Mark Einon [Mon, 22 Sep 2014 19:58:14 +0000 (20:58 +0100)]
staging: et131x: Reduce split lines by renaming some psr variables

Modify some packet status ring associated variables to save a few
split lines:

pktstat_ringsize -> psr_size
psr_num_entries -> psr_entries
index -> ii

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: et131x: Reduce split lines in et131x_rx_dma_memory_alloc()
Mark Einon [Mon, 22 Sep 2014 19:58:13 +0000 (20:58 +0100)]
staging: et131x: Reduce split lines in et131x_rx_dma_memory_alloc()

Modify temporary variables so that split lines can be reduced:

index -> k
fbr_tmp_physaddr -> fbr_physaddr

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: et131x: Remove unused ce_stats struct member
Mark Einon [Mon, 22 Sep 2014 19:58:12 +0000 (20:58 +0100)]
staging: et131x: Remove unused ce_stats struct member

This ce_stats struct member is no longer used. Remove it.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: et131x: Remove unused MP_TCB defines
Mark Einon [Mon, 22 Sep 2014 19:58:11 +0000 (20:58 +0100)]
staging: et131x: Remove unused MP_TCB defines

These two defines are not used, so remove them.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: et131x: Remove unused et131x_adapter struct members
Mark Einon [Mon, 22 Sep 2014 19:58:10 +0000 (20:58 +0100)]
staging: et131x: Remove unused et131x_adapter struct members

These two adapter struct members are not used, remove them.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: octeon: Fix missing blank line warning.
Aybuke Ozdemir [Mon, 22 Sep 2014 22:36:23 +0000 (01:36 +0300)]
Staging: octeon: Fix missing blank line warning.

Fixes "Missing a blank line after declarations"
checkpatch.pl warning in ethernet-xaui.c

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: media: lirc: remove unnecessary break after return
Tapasweni Pathak [Sun, 21 Sep 2014 06:23:20 +0000 (11:53 +0530)]
staging: media: lirc: remove unnecessary break after return

This patch fixes checkpatch.pl warning in lirc_serial.c file
WARNING : break is not useful after goto or return

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: media: lirc: fixed else after return or break warning
Tapasweni Pathak [Sun, 21 Sep 2014 06:21:38 +0000 (11:51 +0530)]
Staging: media: lirc: fixed else after return or break warning

This patch fixes checkpatch.pl warning in file lirc_serial.c
WARNING : else is not generally useful after a break or return

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: media: lirc: Fixed quoted string split warning.
Gulsah Kose [Sun, 21 Sep 2014 19:26:02 +0000 (22:26 +0300)]
staging: media: lirc: Fixed quoted string split warning.

This patch fixes "quoted string split across lines" checkpatch.pl
warning in lirc_imon.c.

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: media: omap4iss: Fix missing blank line warning.
Gulsah Kose [Sun, 21 Sep 2014 13:37:20 +0000 (16:37 +0300)]
staging: media: omap4iss: Fix missing blank line warning.

Fixes "Missing a blank line after declarations" checkpatch.pl warning in
iss_video.c

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Acked-by: Daniel Baluta <daniel.baluta@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: media: omap4iss: Fixes missing blank line warning.
Gulsah Kose [Sun, 21 Sep 2014 13:31:03 +0000 (16:31 +0300)]
staging: media: omap4iss: Fixes missing blank line warning.

Fixes "Missing a blank line after declarations" checkpatch.pl warning in
iss_csi2.c

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Acked-by: Daniel Baluta <daniel.baluta@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agodrivers: staging: lustre: Fix "open brace '{' following struct go on the same line...
Greg Donald [Mon, 22 Sep 2014 14:39:53 +0000 (09:39 -0500)]
drivers: staging: lustre: Fix "open brace '{' following struct go on the same line" errors

Fix checkpatch.pl "open brace '{' following struct go on the same line" errors

Signed-off-by: Greg Donald <gdonald@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: lustre: include: linux: Fix line over 80 characters.
Aybuke Ozdemir [Mon, 22 Sep 2014 22:53:24 +0000 (01:53 +0300)]
Staging: lustre: include: linux: Fix line over 80 characters.

The following patch fixes the checkpatch.pl warning:
WARNING: line over 80 characters.

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: lustre: Unnecessory else and braces are removed
Vaishali Thakkar [Tue, 23 Sep 2014 13:51:32 +0000 (19:21 +0530)]
Staging: lustre: Unnecessory else and braces are removed

This patch fixes following checkpatch.pl warning using coccinelle:

WARNING: else is not generally useful after a break or return

Semantic patch used for this is as follows:

@rule1@
expression e1;
@@

        if (e1) { ... return ...; }
-       else{
                ...
-       }

@rule2@
expression e2;
statement s1;
@@

        if(e2) { ... return ...; }
-       else
                s1

Signed-off-by: Vaishali Thakkar <vthakkar1994@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: lustre: Return statement is moved left after removing else
Vaishali Thakkar [Tue, 23 Sep 2014 13:52:41 +0000 (19:22 +0530)]
Staging: lustre: Return statement is moved left after removing else

This patch fixes following checkpatch.pl warning using coccinelle:

WARNING: else is not generally useful after a break or return

Semantic patch used for this is as follows:

@rule1@
expression e1;
@@

        if (e1) { ... return ...; }
-       else{
                ...
-       }

@rule2@
expression e2;
statement s1;
@@

        if(e2) { ... return ...; }
-       else
                s1

Signed-off-by: Vaishali Thakkar <vthakkar1994@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: lustre: Replace GOTO macro with necessary code
Tina Johnson [Sat, 20 Sep 2014 18:38:05 +0000 (00:08 +0530)]
Staging: lustre: Replace GOTO macro with necessary code

The GOTO macro is neither standard in Linux nor does its definiton
contain much useful code. Hence GOTO can be replaced with useful
parts of its definition. In a statement like GOTO(label, rc), the
replacing code will be goto label if rc is a constant or a variable.
But in cases like GOTO(label, e) where e is an assignment statement,
both assignment and goto statements are kept.

This patch was done using Coccinelle and the following semantic
patch was used:

@@
identifier rc,label;
expression e;
constant c;
@@

(
-GOTO(label,rc = e);
+rc = e;
+goto label;
|
-GOTO(label,rc);
+goto label;
|
-GOTO(label,c);
+goto label;
)

Signed-off-by: Tina Johnson <tinajohnson.1234@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8712: merge lines and remove unused variable for immediate return
Tapasweni Pathak [Mon, 22 Sep 2014 16:33:43 +0000 (22:03 +0530)]
staging: rtl8712: merge lines and remove unused variable for immediate return

This patch merge two lines in a single line if immediate return is found.
Unused variables in each case were removed manually as they are no longer
needed.

This is done using Coccinelle. Semantic patch used for this is as
follows :
@@
expression ret;
identifier f;
@@

-ret =
+return
     f(...);
-return ret;

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8712: Add space after return type
Tapasweni Pathak [Sun, 21 Sep 2014 01:33:31 +0000 (07:03 +0530)]
Staging: rtl8712: Add space after return type

This patch fixes checkpatch.pl warning in file rtl871x_ioctl.h
WARNING : Missing space after return type

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8712: Remove unnecessary parentheses
Tapasweni Pathak [Sun, 21 Sep 2014 01:22:39 +0000 (06:52 +0530)]
Staging: rtl8712: Remove unnecessary parentheses

This patch fixes checkpatch.pl warning in files of rel8712
WARNING : Unnecessary parentheses - maybe == should be = ?

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8712 : Fix line over 80 characters
Tapasweni Pathak [Sun, 21 Sep 2014 01:12:21 +0000 (06:42 +0530)]
Staging: rtl8712 : Fix line over 80 characters

This patch fixes checkpatch.pl warning in files of rtl8712
WARNING : line over 80 characters

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8712: use kmalloc_array over kmalloc
Tapasweni Pathak [Sun, 21 Sep 2014 00:19:41 +0000 (05:49 +0530)]
Staging: rtl8712: use kmalloc_array over kmalloc

This patch fixes checkpatch.pl warning in file rtl871x_xmit.c
WARNING : prefer kmalloc_array over kmalloc with multiply

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8712: remove unnecessary 'out of memory' message
Tapasweni Pathak [Sun, 21 Sep 2014 00:17:37 +0000 (05:47 +0530)]
Staging: rtl8712: remove unnecessary 'out of memory' message

This patch fixes checkpatch.pl warning in file usb_ops_linux.c
WARNING : possible unecessary 'out of memory' message

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8712: fixed space prohibition
Tapasweni Pathak [Sun, 21 Sep 2014 00:15:18 +0000 (05:45 +0530)]
Staging: rtl8712: fixed space prohibition

This patch fixes checkpatch.pl warning in file rtl871x_io.h
WARNING : space prohibited before semicolon

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8712: remove void function return; statement
Tapasweni Pathak [Sun, 21 Sep 2014 00:08:20 +0000 (05:38 +0530)]
Staging: rtl8712: remove void function return; statement

This patch fixes checkpatch.pl warning in files of rtl8712
WARNING : void function return statement are not generally useful

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8712: remove semicolon after macro
Tapasweni Pathak [Sun, 21 Sep 2014 00:05:07 +0000 (05:35 +0530)]
Staging: rtl8712: remove semicolon after macro

This patch fixes checkpatch.pl warning in rtl871x_mp.h file
WARNING : Macro should not use a trailing semicolon

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8712: Missing a blank line after declarations
Aybuke Ozdemir [Sun, 21 Sep 2014 00:01:32 +0000 (03:01 +0300)]
Staging: rtl8712: Missing a blank line after declarations

This patch fixes these warning messages found by checkpatch.pl:
WARNING : Missing a blank line after declarations.

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8712: Remove unnecessary parentheses.
Aybuke Ozdemir [Sun, 21 Sep 2014 00:01:31 +0000 (03:01 +0300)]
Staging: rtl8712: Remove unnecessary parentheses.

This patch fixes checkpatch.pl warning
Unnecessary parentheses in rtl871x_xmit.c

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8712: remove break after return statement
Tapasweni Pathak [Sat, 20 Sep 2014 23:51:58 +0000 (05:21 +0530)]
Staging: rtl8712: remove break after return statement

This patch fixes checkpatch.pl warning in rtl871x_ioctl_linux.c file
WARNING : break is not useful after goto or return

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: iio: meter: Fix unnecessary space warning
Aybuke Ozdemir [Sun, 21 Sep 2014 17:43:06 +0000 (20:43 +0300)]
Staging: iio: meter: Fix unnecessary space warning

Fixed "Unnecessary space before function pointer argument" checkpatch.pl
warning in ade7854.h

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: iio: accel: remove else after return
Tapasweni Pathak [Mon, 22 Sep 2014 09:20:22 +0000 (14:50 +0530)]
staging: iio: accel: remove else after return

This patch fixes checkpatch.pl warning in files of iio: accel
WARNING : else is not generally useful after a break or return

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: iio: adc: Fix else after return warning
Darshana Padmadas [Sun, 21 Sep 2014 09:41:41 +0000 (15:11 +0530)]
Staging: iio: adc: Fix else after return warning

This patch fixes checkpatch.pl warning:
WARNING: else is not generally useful after a break or return

Signed-off-by: Darshana Padmadas <darshanapadmadas@gmail.com>
Acked-by: Daniel Baluta <daniel.baluta@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: iio: adc: Fix quoted string split accross lines
Darshana Padmadas [Sun, 21 Sep 2014 06:44:02 +0000 (12:14 +0530)]
Staging: iio: adc: Fix quoted string split accross lines

This patch fixes the checkpatch warning:
WARNING: quoted string split across lines

Signed-off-by: Darshana Padmadas <darshanapadmadas@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: iio: accel: Replace msleep with usleep for given range
Darshana Padmadas [Sat, 20 Sep 2014 15:14:24 +0000 (20:44 +0530)]
Staging: iio: accel: Replace msleep with usleep for given range

This patch fixes checkpatch.pl warning:
WARNING: msleep < 20ms can sleep for up to 20ms; see Documentation/timers/timers-howto.txt

As per Documentation/timers/timers-howto.txt usleep_range should be used
for sleeping for 10us-20ms

Signed-off-by: Darshana Padmadas <darshanapadmadas@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: iio: adc: Fix warning prefer kmalloc_array over kmalloc
Darshana Padmadas [Sat, 20 Sep 2014 13:00:19 +0000 (18:30 +0530)]
Staging: iio: adc: Fix warning prefer kmalloc_array over kmalloc

This patch fixes the checkpatch warning:
WARNING: Prefer kmalloc_array over kmalloc with multiply

kmalloc_array is preffered for allocating for arrays.

Signed-off-by: Darshana Padmadas <darshanapadmadas@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: iio: fix up merge error
Greg Kroah-Hartman [Mon, 22 Sep 2014 14:54:10 +0000 (07:54 -0700)]
staging: iio: fix up merge error

Fix up a build merge error in drivers/iio/accel/bma180.c that I caused.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoMerge 3.17-rc6 into staging-next.
Greg Kroah-Hartman [Mon, 22 Sep 2014 14:30:03 +0000 (07:30 -0700)]
Merge 3.17-rc6 into staging-next.

We want the fixes in there, and it resolves a merge issue with
drivers/iio/accel/bma180.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoLinux 3.17-rc6
Linus Torvalds [Sun, 21 Sep 2014 22:43:02 +0000 (15:43 -0700)]
Linux 3.17-rc6

10 years agoMerge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Linus Torvalds [Sun, 21 Sep 2014 19:11:52 +0000 (12:11 -0700)]
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

Pull ARM fixes from Russell King:
 "Fixes for ARM, the most notable being the fix from Nathan Lynch to fix
  the state of various registers during execve, to ensure that data
  can't be leaked between two executables.

  Fixes from Victor Kamensky for get_user() on big endian platforms,
  since the addition of 8-byte get_user() support broke these fairly
  badly.

  A fix from Sudeep Holla for affinity setting when hotplugging CPU 0.

  A fix from Stephen Boyd for a perf-induced sleep attempt while atomic.

  Lastly, a correctness fix for emulation of the SWP instruction on
  ARMv7+, and a fix for wrong carry handling when updating the
  translation table base address on LPAE platforms"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: 8149/1: perf: Don't sleep while atomic when enabling per-cpu interrupts
  ARM: 8148/1: flush TLS and thumbee register state during exec
  ARM: 8151/1: add missing exports for asm functions required by get_user macro
  ARM: 8137/1: fix get_user BE behavior for target variable with size of 8 bytes
  ARM: 8135/1: Fix in-correct barrier usage in SWP{B} emulation
  ARM: 8133/1: use irq_set_affinity with force=false when migrating irqs
  ARM: 8132/1: LPAE: drop wrong carry flag correction after adding TTBR1_OFFSET

10 years agoMerge tag 'media-v3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
Linus Torvalds [Sun, 21 Sep 2014 17:56:50 +0000 (10:56 -0700)]
Merge tag 'media-v3.17-rc6' of git://git./linux/kernel/git/mchehab/linux-media

Pull media fixes from Mauro Carvalho Chehab:
 "some media bug fixes:
   - a Kconfig dependency issue
   - some fixes for af9033/it913x demod to be more reliable and address
     a performance regression
   - cx18: fix an oops on devices with tda8290 tuner
   - two new USB IDs for af9035
   - a couple fixes on smapp driver"

* tag 'media-v3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] af9035: new IDs: add support for PCTV 78e and PCTV 79e
  [media] af9033: feed clock to RF tuner
  [media] it913x: init tuner on attach
  [media] af9033: update IT9135 tuner inittabs
  [media] Kconfig: do not select SPI bus on sub-driver auto-select
  [media] cx18: fix kernel oops with tda8290 tuner
  [media] smiapp: Set sub-device owner
  [media] smiapp: Fix power count handling

10 years agoMerge tag 'staging-3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
Linus Torvalds [Sat, 20 Sep 2014 17:43:37 +0000 (10:43 -0700)]
Merge tag 'staging-3.17-rc6' of git://git./linux/kernel/git/gregkh/staging

Pull staging / IIO fixes from Greg KH:
 "Here are some IIO and Staging driver fixes for 3.17-rc6.  They are all
  pretty simple, and resolve reported issues"

* tag 'staging-3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: vt6655: buffer overflow in ioctl
  iio:magnetometer: bugfix magnetometers gain values
  iio: adc: at91: don't use the last converted data register
  iio: adc: xilinx-xadc: assign auxiliary channels address correctly
  iio: meter: ade7758: Fix indio_dev->trig assignment
  iio: inv_mpu6050: Fix indio_dev->trig assignment
  iio: gyro: itg3200: Fix indio_dev->trig assignment
  iio: st_sensors: Fix indio_dev->trig assignment
  iio: hid_sensor_hub: Fix indio_dev->trig assignment
  iio: adc: ad_sigma_delta: Fix indio_dev->trig assignment
  iio: accel: bma180: Fix indio_dev->trig assignment
  iio:trigger: modify return value for iio_trigger_get
  iio:inkern: fix overwritten -EPROBE_DEFER in of_iio_channel_get_by_name

10 years agoMerge tag 'usb-3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Linus Torvalds [Sat, 20 Sep 2014 17:42:56 +0000 (10:42 -0700)]
Merge tag 'usb-3.17-rc6' of git://git./linux/kernel/git/gregkh/usb

Pull USB fixes / quirks from Greg KH:
 "Here are some USB and PHY fixes and quirks for 3.17-rc6.  Nothing
  major, just a few things that have been reported"

* tag 'usb-3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  USB: storage: Add quirks for Entrega/Xircom USB to SCSI converters
  USB: storage: Add quirk for Ariston Technologies iConnect USB to SCSI adapter
  USB: storage: Add quirk for Adaptec USBConnect 2000 USB-to-SCSI Adapter
  USB: EHCI: unlink QHs even after the controller has stopped
  phy: spear1340-miphy: fix driver dependencies
  phy: spear1310-miphy: fix driver dependencies
  phy: miphy365x: Fix off-by-one error

10 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
Linus Torvalds [Sat, 20 Sep 2014 17:41:38 +0000 (10:41 -0700)]
Merge git://git./linux/kernel/git/nab/target-pending

Pull SCSI target fixes from Nicholas Bellinger:
 "Here are the target pending fixes for v3.17-rc6.

  Included are Sagi's long overdue fixes related to iser-target
  shutdown, along with a couple of fixes from Sebastian related to ALUA
  Referrals changes that when in during the v3.14 time-frame.

  Also included are a few iscsi-target fixes, most recently of which
  where found during Joern's Coverity scanning of target code"

* git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
  iscsi-target: avoid NULL pointer in iscsi_copy_param_list failure
  iscsi-target: Fix memory corruption in iscsit_logout_post_handler_diffcid
  target: Fix inverted logic in SE_DEV_ALUA_SUPPORT_STATE_STORE
  target: Fix user data segment multiplier in spc_emulate_evpd_b3()
  iscsi-target: Ignore ICF_GOT_LAST_DATAOUT during Data-Out ITT lookup
  Target/iser: Fix initiator_depth and responder_resources
  Target/iser: Avoid calling rdma_disconnect twice
  Target/iser: Don't put isert_conn inside disconnected handler
  Target/iser: Get isert_conn reference once got to connected_handler

10 years agoMerge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Linus Torvalds [Sat, 20 Sep 2014 17:10:14 +0000 (10:10 -0700)]
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Pull drm fixes from Dave Airlie:
 "A bunch of radeon fixes for oops on module unload, and problems with
  resetting the dma engine, one nouveau fix for black boxes in rendering
  on my mbp retina, one sti fix, and a couple of intel fixes"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/nouveau: ltc/gf100-: fix cbc issues on certain boards
  drm/bochs: add missing drm_connector_register call
  drm/cirrus: add missing drm_connector_register call
  drm/radeon: Fix typo 'addr' -> 'entry' in rs400_gart_set_page
  drm/nouveau/runpm: fix module unload
  drm/radeon/px: fix module unload
  vgaswitcheroo: add vga_switcheroo_fini_domain_pm_ops
  drm/radeon: don't reset dma on r6xx-evergreen init
  drm/radeon: don't reset sdma on CIK init
  drm/radeon: don't reset dma on NI/SI init
  drm/radeon/dpm: fix resume on mullins
  drm/radeon: Disable HDP flush before every CS again for < r600
  drm/radeon: delete unused PTE_* defines
  drm/i915: Add limited color range readout for HDMI/DP ports on g4x/vlv/chv
  drm: sti: do not iterate over the info frame array
  drm/i915: Fix SRC_COPY width on 830/845g

10 years agodrm/nouveau: ltc/gf100-: fix cbc issues on certain boards
Ben Skeggs [Sat, 20 Sep 2014 07:39:00 +0000 (17:39 +1000)]
drm/nouveau: ltc/gf100-: fix cbc issues on certain boards

A mismatch between FB and LTC's idea of how big a large page is causes
issues such as black "holes" in rendering to occur on some boards
(those where LTC is configured for 64KiB large pages) when compression
is used.

Confirmed to fix at least the GK107 MBP.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
10 years agoMerge branch 'drm-fixes-3.17' of git://people.freedesktop.org/~agd5f/linux into drm...
Dave Airlie [Sat, 20 Sep 2014 07:23:37 +0000 (17:23 +1000)]
Merge branch 'drm-fixes-3.17' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

single fix for regression on rs4xx/rs690/rs740
* 'drm-fixes-3.17' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: Fix typo 'addr' -> 'entry' in rs400_gart_set_page

10 years agodrm/bochs: add missing drm_connector_register call
Gerd Hoffmann [Fri, 19 Sep 2014 08:11:37 +0000 (10:11 +0200)]
drm/bochs: add missing drm_connector_register call

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
10 years agodrm/cirrus: add missing drm_connector_register call
Gerd Hoffmann [Fri, 19 Sep 2014 08:11:36 +0000 (10:11 +0200)]
drm/cirrus: add missing drm_connector_register call

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
10 years agoStaging: rtl8192e: Fix __constant_htons to htons style warning
Mahati Chamarthy [Thu, 18 Sep 2014 13:57:09 +0000 (19:27 +0530)]
Staging: rtl8192e: Fix __constant_htons to htons style warning

This fixes the following checkpatch.pl warning:
WARNING: __constant_htons should be htons

Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: iio: cdc: Don't put an else right after a return
Catalina Mocanu [Fri, 19 Sep 2014 22:55:05 +0000 (15:55 -0700)]
staging: iio: cdc: Don't put an else right after a return

This fixes the following checkpatch.pl warning:
WARNING: else is not generally useful after a break or return.

While at it, remove new line for symmetry with the rest of the code.

Signed-off-by: Catalina Mocanu <catalina.mocanu@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: octeon: Fix quoted string split warning.
Gulsah Kose [Sat, 20 Sep 2014 20:32:05 +0000 (23:32 +0300)]
staging: octeon: Fix quoted string split warning.

This patch fixes "quoted string split across lines" checkpatch.pl
warning in ethernet.c

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: octeon: Fix missing blank line warning.
Gulsah Kose [Sat, 20 Sep 2014 20:27:39 +0000 (23:27 +0300)]
staging: octeon: Fix missing blank line warning.

Fixes "Missing a blank line after declarations" checkpatch.pl warning in
ethernet.c

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: emxx_udc: Replace __constant_cpu_to_le16 with cpu_to_le16
Roberta Dobrescu [Fri, 19 Sep 2014 20:34:36 +0000 (23:34 +0300)]
staging: emxx_udc: Replace __constant_cpu_to_le16 with cpu_to_le16

This fixes the following checkpatch.pl warning:
WARNING: __constant_cpu_to_le16 should be cpu_to_le16
Additionally, it removes the space between function name and (.

Signed-off-by: Roberta Dobrescu <roberta.dobrescu@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8821ae: Fix warnings of no space before tabs.
Aybuke Ozdemir [Thu, 18 Sep 2014 21:31:44 +0000 (00:31 +0300)]
Staging: rtl8821ae: Fix warnings of no space before tabs.

This patch fixes these warning messages found by checkpatch.pl:
WARNING: please, no space before tabs.

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8821ae: Fix "foo * bar" warning.
Aybuke Ozdemir [Thu, 18 Sep 2014 20:56:13 +0000 (23:56 +0300)]
Staging: rtl8821ae: Fix "foo * bar" warning.

This patch fixes these error messages found by checkpatch.pl:
ERROR: "foo* bar" should be "foo *bar"

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>