platform/kernel/linux-starfive.git
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>
10 years agoStaging: wlan-ng: Fix return in void function warning
Aybuke Ozdemir [Wed, 17 Sep 2014 22:03:28 +0000 (01:03 +0300)]
Staging: wlan-ng: Fix return in void function warning

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

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: media: cxd2099: Missing a blank line after declarations
Aybuke Ozdemir [Wed, 17 Sep 2014 21:54:04 +0000 (00:54 +0300)]
Staging: media: cxd2099: Missing a blank line after declarations

Fix checkpatch.pl issues with missing a blank
line after declarations in cxd2099.c

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: octeon: Missing a blank line after declarations
Aybuke Ozdemir [Wed, 17 Sep 2014 20:43:15 +0000 (23:43 +0300)]
Staging: octeon: Missing a blank line after declarations

Fix checkpatch.pl issues with missing a blank
line after declarations in ethernet-sgmii.c

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: gs_fpgaboot Fix trailing whitespace.
Aybuke Ozdemir [Wed, 17 Sep 2014 13:10:36 +0000 (16:10 +0300)]
staging: gs_fpgaboot Fix trailing whitespace.

Fix checkpatch.pl issues with trailing
whitespace in README.

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: bcm: Fix line over 80 characters
Aybuke Ozdemir [Wed, 17 Sep 2014 12:33:25 +0000 (15:33 +0300)]
staging: bcm: Fix line over 80 characters

Fix checkpatch.pl issues with
line over 80 characters in HandleControlPacket.c

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: media: lirc: Fixes missing blank line warning.
Gulsah Kose [Sat, 20 Sep 2014 22:20:44 +0000 (01:20 +0300)]
staging: media: lirc: Fixes missing blank line warning.

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

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: media: lirc: Fixes unnecessary return warning.
Gulsah Kose [Sat, 20 Sep 2014 22:26:03 +0000 (01:26 +0300)]
staging: media: lirc: Fixes unnecessary return warning.

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

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

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

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

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

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: media: lirc: Fix unnecessary return warning.
Gulsah Kose [Sat, 20 Sep 2014 21:59:11 +0000 (00:59 +0300)]
staging: media: lirc: Fix unnecessary return warning.

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

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

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

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: media: lirc: lirc_imon: Removed unnecessary variable to simplify return...
Tina Johnson [Tue, 16 Sep 2014 21:44:52 +0000 (03:14 +0530)]
Staging: media: lirc: lirc_imon: Removed unnecessary variable to simplify return variable handling

Variable rc was removed after merging its assignment statement with
immediately following return statement. Variable retval is not used
at all other that to return its initial value.Hence replaced retval
with its initial value in the return statement and removed the variable.

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

@rule1@
identifier ret;
expression e;
@@

-int ret = 0;
 ... when != ret
(
-ret = e;
+return e;
-return ret;
|
-return ret;
+return 0;
)

Signed-off-by: Tina Johnson <tinajohnson.1234@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: lustre: lnet: lnet: Fixed quoted string split warning.
Gulsah Kose [Sat, 20 Sep 2014 18:39:46 +0000 (21:39 +0300)]
staging: lustre: lnet: lnet: Fixed quoted string split warning.

This patch fixes "quoted string split across lines" checkpatch.pl
warning in api-ni.c

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: lustre: lnet: lnet: Fix missing line warning.
Gulsah Kose [Sat, 20 Sep 2014 18:48:00 +0000 (21:48 +0300)]
staging: lustre: lnet: lnet: Fix missing line warning.

This patch fixes "Fixes "Missing a blank line after declarations"
checkpatch.pl warning in api-ni.c

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: lustre: lnet: lnet: Fix quoted string split warning.
Gulsah Kose [Sat, 20 Sep 2014 18:53:31 +0000 (21:53 +0300)]
staging: lustre: lnet: lnet: Fix quoted string split warning.

This patch fixes "quoted string split across lines" checkpatch.pl
warning in lib-eq.c

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: lustre: Fix return in void function warning
Darshana Padmadas [Wed, 17 Sep 2014 15:28:43 +0000 (20:58 +0530)]
Staging: lustre: Fix return in void function warning

This fixes checkpatch.pl warning:

WARNING: void function return statements are not generally useful

Signed-off-by: Darshana Padmadas <darshanapadmadas@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: lustre: place open brace following struct on same line
Darshana Padmadas [Wed, 17 Sep 2014 14:58:54 +0000 (20:28 +0530)]
Staging: lustre: place open brace following struct on same line

This patch fixes checkpatch.pl warning:

WARNING: open brace following struct goes on the same line.

Signed-off-by: Darshana Padmadas <darshanapadmadas@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: lustre: libcfs: fix checkpatch warning else after return statement
Darshana Padmadas [Wed, 17 Sep 2014 12:44:45 +0000 (18:14 +0530)]
Staging: lustre: libcfs: fix checkpatch warning else after return statement

Fix checkpatch warning by removing unnecessary else after return statement.

Signed-off-by: Darshana Padmadas <darshanapadmadas@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: lustre: include: libcfs: removed else before return statement in libcfs_crypto.h
Darshana Padmadas [Tue, 16 Sep 2014 07:54:13 +0000 (13:24 +0530)]
Staging: lustre: include: libcfs: removed else before return statement in libcfs_crypto.h

This is a patch to libcfs_crypto.h that fixes warning on unnecessary else before return statement found by checkpatch.pl tool.

Signed-off-by: Darshana Padmadas <darshanapadmadas@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: speakup: fix checkpatch warning
Roxana Blaj [Mon, 15 Sep 2014 11:58:44 +0000 (14:58 +0300)]
staging: speakup: fix checkpatch warning

This fixes the checkpatch warning:
WARNING: line over 80 characters

Signed-off-by: Roxana Blaj <roxanagabriela10@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: speakup: fix checkpatch warning
Roxana Blaj [Sun, 14 Sep 2014 17:28:53 +0000 (20:28 +0300)]
staging: speakup: fix checkpatch warning

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

Signed-off-by: Roxana Blaj <roxanagabriela10@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: speakup: fix checkpatch warning
Nicoleta Birsan [Sun, 14 Sep 2014 10:38:34 +0000 (03:38 -0700)]
Staging: speakup: fix checkpatch warning

This fixes the following checkpatch.pl warning:
WARNING: Missing a blank line after declarations

Signed-off-by: Nicoleta Birsan <nicolle.birsan@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: skein: replace spaces with tabs
Blaj Roxana [Tue, 16 Sep 2014 17:13:28 +0000 (20:13 +0300)]
staging: skein: replace spaces with tabs

This fixes the error and warning:
ERROR: code indent should use tabs where possible
WARNING: please, no spaces at the start of a line

Signed-off-by: Blaj Roxana <roxanagabriela10@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: dgnc: Check sscanf return value
Roberta Dobrescu [Fri, 19 Sep 2014 21:01:39 +0000 (00:01 +0300)]
staging: dgnc: Check sscanf return value

This fixes the following checkpatch.pl warnings:
WARNING: unchecked sscanf return value

Signed-off-by: Roberta Dobrescu <roberta.dobrescu@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: dgnc: Fix unnecessary space warning.
Gulsah Kose [Sat, 20 Sep 2014 16:34:45 +0000 (19:34 +0300)]
staging: dgnc: Fix unnecessary space warning.

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

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: dgnc: Fix missing blank line warning.
Gulsah Kose [Sat, 20 Sep 2014 16:31:15 +0000 (19:31 +0300)]
staging: dgnc: Fix missing blank line warning.

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

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: dgnc: Merge lines and remove unused variable for immediate return
Vaishali Thakkar [Fri, 19 Sep 2014 05:00:59 +0000 (10:30 +0530)]
Staging: dgnc: Merge lines and remove unused variable for immediate return

This patch merges two lines in a single line if immediate
return is found. It also removes unnecessory variable rc
as it is no longer needed.

This is done using Coccinelle. Semantic patch used for this
is as follows:

@@
type T;
identifier i;
identifier f;
constant C;
@@
- T i;
  ...when != i
     when strict
(
  return -C;
|
- i =
+ return
     f(...);
- return i;
)

Signed-off-by: Vaishali Thakkar <vthakkar1994@gmail.com>
Reviewed-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: dgnc: Move open brace on previous line
Roberta Dobrescu [Thu, 18 Sep 2014 18:38:04 +0000 (21:38 +0300)]
staging: dgnc: Move open brace on previous line

This fixes the following checkpatch.pl errors:
ERROR: that open brace { should be on the previous line

Signed-off-by: Roberta Dobrescu <roberta.dobrescu@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: dgnc: Do not initialise statics to 0 or NULL
Roberta Dobrescu [Tue, 16 Sep 2014 17:33:03 +0000 (20:33 +0300)]
staging: dgnc: Do not initialise statics to 0 or NULL

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

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: dgnc: Replace kzalloc with kcalloc
Roberta Dobrescu [Mon, 15 Sep 2014 18:32:59 +0000 (21:32 +0300)]
staging: dgnc: Replace kzalloc with kcalloc

This fixes the following checkpatch.pl warnings:
WARNING: Prefer kcalloc over kzalloc with multiply

Signed-off-by: Roberta Dobrescu <roberta.dobrescu@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: dgnc: Fix warnings relating to printk()
Roberta Dobrescu [Sun, 14 Sep 2014 20:13:20 +0000 (23:13 +0300)]
staging: dgnc: Fix warnings relating to printk()

This fixes the following checkpatch.pl warnings:
WARNING: printk() should include KERN_ facility level
It replaces printk() with dev_dbg() in order to avoid the warning that a more
specific function should be used.

Signed-off-by: Roberta Dobrescu <roberta.dobrescu@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8192ee: rtl8192ee: Fix missing blank line warning
Mahati Chamarthy [Fri, 19 Sep 2014 23:29:59 +0000 (04:59 +0530)]
Staging: rtl8192ee: rtl8192ee: Fix missing blank line warning

This fixes the following checkpatch.pl warnings:
WARNING: Missing a blank line after declarations

Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8192ee: Fix else not useful style warning
Mahati Chamarthy [Fri, 19 Sep 2014 23:19:43 +0000 (04:49 +0530)]
Staging: rtl8192ee: Fix else not useful style warning

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: rtl8192ee: Fix break is not useful warning
Mahati Chamarthy [Fri, 19 Sep 2014 22:33:36 +0000 (04:03 +0530)]
Staging: rtl8192ee: Fix break is not useful warning

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

Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8192ee: Fix else is not useful warning
Mahati Chamarthy [Fri, 19 Sep 2014 22:12:01 +0000 (03:42 +0530)]
Staging: rtl8192ee: Fix else is not useful warning

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: rtl8192ee: Fix missing blank line warning
Mahati Chamarthy [Fri, 19 Sep 2014 21:59:19 +0000 (03:29 +0530)]
Staging: rtl8192ee: Fix missing blank line warning

This fixes the following checkpatch.pl warnings:
WARNING: Missing a blank line after declarations

Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8192e: Fix printk debug style warning
Mahati Chamarthy [Fri, 19 Sep 2014 21:13:26 +0000 (02:43 +0530)]
Staging: rtl8192e: Fix printk debug style warning

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

Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8192e: Fix printk style warning
Mahati Chamarthy [Fri, 19 Sep 2014 21:10:43 +0000 (02:40 +0530)]
Staging: rtl8192e: Fix printk style warning

This fixes the following checkpatch.pl warnings:
WARNING: Prefer [subsystem eg: netdev]_info([subsystem]dev, ... then dev_info(dev, ... then pr_info(...  to printk(KERN_INFO ...

Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8192e: Fix space before semicolon warning
Mahati Chamarthy [Fri, 19 Sep 2014 21:08:39 +0000 (02:38 +0530)]
Staging: rtl8192e: Fix space before semicolon warning

This fixes the following checkpatch.pl warning:
WARNING: space prohibited before semicolon

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
Mahati Chamarthy [Fri, 19 Sep 2014 21:06:31 +0000 (02:36 +0530)]
Staging: rtl8192e: 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: Fix void function return statements style warning
Mahati Chamarthy [Fri, 19 Sep 2014 18:26:02 +0000 (23:56 +0530)]
Staging: rtl8192e: Fix void function return statements style warning

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

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 style warning
Mahati Chamarthy [Fri, 19 Sep 2014 17:42:53 +0000 (23:12 +0530)]
Staging: rtl8192e: Fix else is not useful style warning

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: rtl8192e: Fixed style warning relating to printk()
Vaishali Thakkar [Fri, 19 Sep 2014 16:52:19 +0000 (22:22 +0530)]
Staging: rtl8192e: Fixed style warning relating to printk()

This patch fixes following checkpatch.pl warning in file rtl_dm.c:

WARNING: Prefer [subsystem eg: netdev]_info([subsystem]dev, ... then dev_info(dev, ... then pr_info(...  to printk(KERN_INFO .

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: rtl8192e: Fix unnecessary parentheses style warning
Mahati Chamarthy [Thu, 18 Sep 2014 23:52:33 +0000 (05:22 +0530)]
Staging: rtl8192e: Fix unnecessary parentheses style warning

This fixes the following checkpatch.pl warning:
WARNING: Unnecessary parentheses - maybe == should be = ?

Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8192u: delete unused function CAM_read_entry
Benedict Boerger [Thu, 18 Sep 2014 15:46:23 +0000 (17:46 +0200)]
staging: rtl8192u: delete unused function CAM_read_entry

Fix the sparse warning: symbol 'CAM_read_entry' was not declared. Should it be static?

The function CAM_read_entry is not used and therefore deleted.

Signed-off-by: Benedict Boerger <benedict.boerger@cs.tu-dortmund.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8192u: Move ieee80211_crypto_* declarations to ieee80211/ieee80211.h
Ragnar B. Johannsson [Thu, 18 Sep 2014 14:33:25 +0000 (14:33 +0000)]
staging: rtl8192u: Move ieee80211_crypto_* declarations to ieee80211/ieee80211.h

Move ieee80211_crypto*_init and _exit prototype declarations from r8192U_core.c to ieee80211/ieee80211.h. This fixes the following sparse warnings:

drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c:203:12: warning: symbol 'ieee80211_crypto_init' was not declared. Should it be static?
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c:223:13: warning: symbol 'ieee80211_crypto_deinit' was not declared. Should it be static?
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c:764:12: warning: symbol 'ieee80211_crypto_tkip_init' was not declared. Should it be static?
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c:769:13: warning: symbol 'ieee80211_crypto_tkip_exit' was not declared. Should it be static?
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c:467:12: warning: symbol 'ieee80211_crypto_ccmp_init' was not declared. Should it be static?
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c:472:13: warning: symbol 'ieee80211_crypto_ccmp_exit' was not declared. Should it be static?
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c:281:12: warning: symbol 'ieee80211_crypto_wep_init' was not declared. Should it be static?
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c:286:13: warning: symbol 'ieee80211_crypto_wep_exit' was not declared. Should it be static?

Signed-off-by: Ragnar B. Johannsson <ragnar@igo.is>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8192e: Fix style warnings relating to printk(KERN_DEBUG
Mahati Chamarthy [Thu, 18 Sep 2014 10:13:53 +0000 (15:43 +0530)]
Staging: rtl8192e: Fix style warnings relating to printk(KERN_DEBUG

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

Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8192e: rtl8192e: Remove unnecessory braces and space
Vaishali Thakkar [Wed, 17 Sep 2014 03:05:24 +0000 (08:35 +0530)]
Staging: rtl8192e: rtl8192e: Remove unnecessory braces and space

This patch removes following checkpatch.pl warnings in rtl_core.c file:

WARNING: Braces {} are not necessary for single statement blocks
WARNING: Space prohibited before semicolon

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: rtl8192e: rtl8192e: Remove unnecessory variable
Vaishali Thakkar [Wed, 17 Sep 2014 02:32:43 +0000 (08:02 +0530)]
Staging: rtl8192e: rtl8192e: Remove unnecessory variable

This patch removes unnecessory variable in file ret_core.c
using coccinelle script.Semantic patch for this is as follows:

@@
identifier ret;
@@

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

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: vt6655: Break 80 character long line to remove checkpatch error
Rajbinder Brar [Tue, 16 Sep 2014 05:55:31 +0000 (11:25 +0530)]
Staging: vt6655: Break 80 character long line to remove checkpatch error

This removes checkpatch.pl warning
WARNING: line over 80 characters

Signed-off-by: Rajbinder Brar <brar.rajbinder@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: vt6656: Removing else after break statement to fix warning
Rajbinder Brar [Wed, 17 Sep 2014 15:57:03 +0000 (21:27 +0530)]
Staging: vt6656: Removing else after break statement to fix warning

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

Signed-off-by: Rajbinder Brar <brar.rajbinder@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: vt6655: Fix C99 style commenting.
Aybuke Ozdemir [Fri, 19 Sep 2014 16:49:33 +0000 (19:49 +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: gdm724x: gdm_usb: added error checking in do_tx()
Abel Moyo [Thu, 18 Sep 2014 19:49:10 +0000 (21:49 +0200)]
Staging: gdm724x: gdm_usb: added error checking in do_tx()

Added error checking for alloc_tx_struct in do_tx()

Signed-off-by: Abel Moyo <abelmoyo.ab@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: gdm724x: Fix missing blank line warning.
Gulsah Kose [Sat, 20 Sep 2014 17:43:53 +0000 (20:43 +0300)]
staging: gdm724x: Fix missing blank line warning.

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

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: dgap: use schedule_timeout_interruptible() instead of dgap_ms_sleep()
Daeseok Youn [Tue, 16 Sep 2014 07:19:06 +0000 (16:19 +0900)]
staging: dgap: use schedule_timeout_interruptible() instead of dgap_ms_sleep()

Using schedule_timeout_interruptible() is exactly same as
setting a status of current process and calling  schedule_timeout().

Removes dgap_ms_sleep(), because this function is used
only when closing tty channel on dgap_tty_close().
And also removes ch_close_delay that is always set to 250
on dgap_tty_init().

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: dgap: Remove unnecessary variable.
Ankita Patil [Thu, 18 Sep 2014 07:01:00 +0000 (12:31 +0530)]
Staging: dgap: Remove unnecessary variable.

This patch removes unnecessary variable in file dgap.c
using Coccinelle. Semantic patch for this is as follows:

@@
expression ret;
identifier f;
@@

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

Also removed the unneeded variable manually.

Signed-off-by: Ankita Patil <patil.ankita.r@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: android: sw_sync: checkpatch fixes
Purnendu Kapadia [Mon, 15 Sep 2014 12:06:36 +0000 (13:06 +0100)]
staging: android: sw_sync: checkpatch fixes

   - no space after cast
   - allignment should match open parenthesis
   - remove unnecessary new line

Signed-off-by: Purnendu Kapadia <pro8linux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8723au: hal: Space prohibited before semicolon
Aybuke Ozdemir [Thu, 18 Sep 2014 22:58:29 +0000 (01:58 +0300)]
Staging: rtl8723au: hal: Space prohibited before semicolon

This patch fixes these warning messages found by checkpatch.pl:
WARNING: Space prohibited before semicolon.

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8723au: core: Fix unnecassary braces warning.
Aybuke Ozdemir [Thu, 18 Sep 2014 23:23:53 +0000 (02:23 +0300)]
Staging: rtl8723au: core: Fix unnecassary braces warning.

This patch fixes these warning messages found by checkpatch.pl:
WARNING: braces {} are not necessary for single statement blocks

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8723au: core: Fix "foo * bar" warning.
Aybuke Ozdemir [Thu, 18 Sep 2014 23:33:38 +0000 (02:33 +0300)]
Staging: rtl8723au: core: 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agodrivers: staging: rtl8723au: Fix "space required after that ','" errors
Greg Donald [Tue, 16 Sep 2014 23:37:41 +0000 (18:37 -0500)]
drivers: staging: rtl8723au: 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>
10 years agostaging: rtl8723au: fix sparse incorrect type assignment warnings
Kieron Browne [Tue, 16 Sep 2014 22:28:09 +0000 (23:28 +0100)]
staging: rtl8723au: fix sparse incorrect type assignment warnings

Use cpu_to_le16 to cast int for assignment to __le16 members

Signed-off-by: Kieron Browne <kieron.browne@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Fix checkpatch errors
MihaelaGaman [Sun, 14 Sep 2014 09:56:43 +0000 (12:56 +0300)]
staging: rtl8723au: Fix checkpatch errors

Fix checkpatch.pl "spaces required around":
>, =, =, =, =, +=, >, >, <, <, :, <  errors.

Signed-off-by: MihaelaGaman <mp.gaman@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: rtl8188eu: os_dep: Compression of lines for immediate return
Vaishali Thakkar [Sun, 14 Sep 2014 08:16:37 +0000 (13:46 +0530)]
Staging: rtl8188eu: os_dep: Compression of lines for immediate return

This patch compresses two lines in to a single line in file rtw_android.c
if immediate return statement is found. It also removes variable bytes_written as
it is no longer needed.

It is done using script Coccinelle. And coccinelle uses following semantic
patch for this compression function:

@@
expression ret;
identifier f;
@@

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

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: rtl8188eu: core: Fixed wrong space error.
Gulsah Kose [Sat, 20 Sep 2014 21:13:29 +0000 (00:13 +0300)]
staging: rtl8188eu: core: Fixed wrong space error.

This patch fixes "foo     * bar" should be "foo   *bar" checkpatch.pl error in rtw_cmd.c

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: iio: impedance-analyzer: add blank line after declaration
Catalina Mocanu [Fri, 19 Sep 2014 21:54:54 +0000 (14:54 -0700)]
staging: iio: impedance-analyzer: add blank line after declaration

This fixes the following checkpatch.pl warning:
WARNING: Missing a blank line after declarations.

Signed-off-by: Catalina Mocanu <catalina.mocanu@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: iio: trigger: add blank lines after declarations
Catalina Mocanu [Fri, 19 Sep 2014 21:32:09 +0000 (14:32 -0700)]
staging: iio: trigger: add blank lines after declarations

This fixes the following checkpatch.pl warning:
WARNING: Missing a blank line after declarations.

Signed-off-by: Catalina Mocanu <catalina.mocanu@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: iio: resolver: Missing a blank line after declarations
Aybuke Ozdemir [Fri, 19 Sep 2014 15:48:05 +0000 (18:48 +0300)]
Staging: iio: resolver: 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: iio: dummy: add blank lines after declarations.
Catalina Mocanu [Thu, 18 Sep 2014 21:55:06 +0000 (14:55 -0700)]
staging: iio: dummy: add blank lines after declarations.

This fixes the following checkpatch.pl warning:
WARNING: Missing a blank line after declarations.

Signed-off-by: Catalina Mocanu <catalina.mocanu@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: iio: meter: ade7753: Fixed checkpatch.pl warnings
Tina Johnson [Sat, 13 Sep 2014 10:16:15 +0000 (15:46 +0530)]
Staging: iio: meter: ade7753: Fixed checkpatch.pl warnings

Clean-up patch to fix the following checkpatch.pl warnings:

ade7753.c:325: WARNING: Missing a blank line after declarations
ade7753.c:383: 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: iio: meter: ade7753: Merged assignment with immediately following return...
Tina Johnson [Sun, 14 Sep 2014 11:00:05 +0000 (16:30 +0530)]
Staging: iio: meter: ade7753: Merged assignment with immediately following return statement

Saved one line of code by merging the assigning and return statements
of variable ret. And thus removed variable len which was no longer useful.

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

@@
expression ret;
identifier f;
@@

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

Signed-off-by: Tina Johnson <tinajohnson.1234@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Acked-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: lustre: llite: Use kzalloc and rewrite null tests
Julia Lawall [Thu, 18 Sep 2014 20:24:02 +0000 (22:24 +0200)]
staging: lustre: llite: Use kzalloc and rewrite null tests

This patch removes some kzalloc-related macros and rewrites the
associated null tests to use !x rather than x == NULL.

A simplified version of the semantic patch that makes this change is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@@
expression ptr;
statement S,S1;
@@

  \(OBD_ALLOC\|OBD_ALLOC_WAIT\|OBD_ALLOC_PTR\|OBD_ALLOC_PTR_WAIT\)(ptr,...);
  if (
+     !
      ptr
-      == NULL
     ) S else S1

@@
expression ptr,size;
@@

- OBD_ALLOC(ptr,size)
+ ptr = kzalloc(size, GFP_NOFS)

@@
expression ptr,size;
@@

- OBD_ALLOC_WAIT(ptr,size)
+ ptr = kzalloc(size, GFP_KERNEL)

@@
expression ptr,size;
@@

- OBD_ALLOC_PTR(ptr)
+ ptr = kzalloc(sizeof(*ptr), GFP_NOFS)

@@
expression ptr,size;
@@

- OBD_ALLOC_PTR_WAIT(ptr,size)
+ ptr = kzalloc(sizeof(*ptr), GFP_KERNEL)
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging/bcm: Fix whitespace/comments in Ioctl.h
Martin Kelly [Tue, 16 Sep 2014 04:16:15 +0000 (21:16 -0700)]
Staging/bcm: Fix whitespace/comments in Ioctl.h

Cleanup whitespace and comments in Ioctl.h in a few ways:
- > 80 character cleanup
- Comment clarification
- More consistent vertical alignment

Signed-off-by: Martin Kelly <martkell@amazon.com>
Reviewed-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8821ae: Remove space after unary operator in efuse.c
Fabien Malfoy [Mon, 15 Sep 2014 07:02:36 +0000 (09:02 +0200)]
staging: rtl8821ae: Remove space after unary operator in efuse.c

Several pointer declaration syntax have been fixed to match the coding style.

Signed-off-by: Fabien Malfoy <fabien.malfoy@laposte.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8192u: sparse warnings: declare ieee80211_TURBO_Info static
Merlin Chlosta [Sun, 14 Sep 2014 23:56:10 +0000 (01:56 +0200)]
staging: rtl8192u: sparse warnings: declare ieee80211_TURBO_Info static

Declare ieee80211_TURBO_Info static to fix a sparse "symbol was not declared" warning.

Signed-off-by: Merlin Chlosta <eudyptula@merlin.geekmail.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: emxx_udc: fix compile warnings: discarding const qualifier
Vincenzo Scotti [Sat, 13 Sep 2014 11:39:20 +0000 (13:39 +0200)]
staging: emxx_udc: fix compile warnings: discarding const qualifier

Signed-off-by: Vincenzo Scotti <vinc94@gmail.com>
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: exxx_udc: Convert pr_warning to pr_warn
Masanari Iida [Fri, 12 Sep 2014 16:14:30 +0000 (01:14 +0900)]
staging: exxx_udc: Convert pr_warning to pr_warn

This patch Convert pr_warning to pr_warn.

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: unisys: uislib: uislib.c: sparse warning of context imbalance
Sudip Mukherjee [Fri, 12 Sep 2014 12:27:26 +0000 (17:57 +0530)]
staging: unisys: uislib: uislib.c: sparse warning of context imbalance

fixed sparse warning : context imbalance in 'destroy_device'
                        unexpected unlock
this patch will generate warning from checkpatch for
lines over 80 character , but since those are user-visible strings
so it was not modified.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Tested-by: Benjamin Romer <benjamin.romer@unisys.com>
Acked-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: unisys: Fix sparse error - accessing __iomem directly
Luke Hart [Fri, 12 Sep 2014 09:48:33 +0000 (10:48 +0100)]
staging: unisys: Fix sparse error - accessing __iomem directly

Copy the channel type into a temporary buffer so that code will work
for architectures that don't support MMIO. This now works in same way
as other tests in same function.

Signed-off-by: Luke Hart <luke.hart@birchleys.eu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: et131x: logical continuations should be on the previous line
Mark Einon [Sun, 14 Sep 2014 15:59:05 +0000 (16:59 +0100)]
staging: et131x: logical continuations should be on the previous line

Fix two occurrences of the checkpatch check:

CHECK: Logical continuations should be on the previous line

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: et131x: Fix 'else is not generally useful after a break or return'
Mark Einon [Sun, 14 Sep 2014 15:59:04 +0000 (16:59 +0100)]
staging: et131x: Fix 'else is not generally useful after a break or return'

Fix this checkpatch warning:

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

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: et131x: Use variable names instead of types in sizeof
Mark Einon [Sun, 14 Sep 2014 15:59:08 +0000 (16:59 +0100)]
staging: et131x: Use variable names instead of types in sizeof

A few calls to sizeof() in et131x.c give the type as a parameter
- use the equivalent variable name instead.

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 statements
Mark Einon [Sun, 14 Sep 2014 15:59:07 +0000 (16:59 +0100)]
staging: et131x: Use braces on all arms of if/else statements

In some places in et131x.c, one arm of am if/else statement has braces
and the other not - put braces on both arms where this happens.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: et131x: Remove spaces after casts
Mark Einon [Sun, 14 Sep 2014 15:59:06 +0000 (16:59 +0100)]
staging: et131x: Remove spaces after casts

In three places in et131x.c, spaces exist after a cast. Remove them.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: et131x: Add spinlock definition comments
Mark Einon [Sun, 14 Sep 2014 15:59:02 +0000 (16:59 +0100)]
staging: et131x: Add spinlock definition comments

Checkpatch --strict advises that spinlocks should be described when
defined, seems a good idea so this change does that.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: et131x: Remove useless assignment to NULL
Mark Einon [Sun, 14 Sep 2014 15:59:01 +0000 (16:59 +0100)]
staging: et131x: Remove useless assignment to NULL

The stack variable skb is no longer used after it's set to
NULL. Don't set it to NULL.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: et131x: Remove send_hw_lock spinlock
Mark Einon [Sun, 14 Sep 2014 15:59:00 +0000 (16:59 +0100)]
staging: et131x: Remove send_hw_lock spinlock

We don't need to use this lock - the tx path is protected by the
networking subsystem xmit_lock, so we don't also need it in
nic_send_packet().

The other use of this spinlock in et1310_enable_phy_coma() to protect
a low power flag makes no sense, so can just be removed.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: et131x: Simplify unlocking tcb_send_qlock in et131x_tx_timeout()
Mark Einon [Sun, 14 Sep 2014 15:58:59 +0000 (16:58 +0100)]
staging: et131x: Simplify unlocking tcb_send_qlock in et131x_tx_timeout()

The tcb_send_qlock spinlock is unlocked in all three paths at the end of
et131x_tx_timeout(). We can call it once before entering any of the paths,
saving ourselves a few lines of code.

This change puts tcb->count++ outside of the lock, but et131x_tx_timeout()
itself is protected by the tx_global_lock, so this shouldn't matter.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: et131x: Remove blank lines form et131x.c
Mark Einon [Sun, 14 Sep 2014 15:58:58 +0000 (16:58 +0100)]
staging: et131x: Remove blank lines form et131x.c

Remove some unecessary blank lines from et131x.c

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: et131x: Remove extra blank lines in et131x.h
Mark Einon [Sun, 14 Sep 2014 17:53:37 +0000 (18:53 +0100)]
staging: et131x: Remove extra blank lines in et131x.h

Remove some blank lines from et131.h, including double blank lines.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: et131x: Remove 'reduce number of spinlocks' TODO item
Mark Einon [Thu, 11 Sep 2014 21:59:46 +0000 (22:59 +0100)]
staging: et131x: Remove 'reduce number of spinlocks' TODO item

The number of spinlocks has been halved, from 8 to 4 since this
comment was made, let's see if this is enough.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: et131x: Simplify code in nic_rx_pkts() for multicast_pkts_rcvd
Mark Einon [Thu, 11 Sep 2014 21:59:45 +0000 (22:59 +0100)]
staging: et131x: Simplify code in nic_rx_pkts() for multicast_pkts_rcvd

In nic_rx_pkts(), we check that a multicast packet received (when using
a multicast list) is one that was requested - despite setting the list
up with the hardware. We shouldn't expect to get a mc packet we didn't
ask for, so remove these extra checks.

This also means that the surrounding code can be tiedied up a little.

Tested somewhat with omping, with no adverse effects seen.

Also remove this item from the TODO list.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: et131x: Combine two if statements with same effect
Mark Einon [Thu, 11 Sep 2014 21:59:44 +0000 (22:59 +0100)]
staging: et131x: Combine two if statements with same effect

Both these if statements have the same effect when true, so combine
them and save a few lines.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: et131x: Remove struct tcb->flags
Mark Einon [Thu, 11 Sep 2014 21:59:43 +0000 (22:59 +0100)]
staging: et131x: Remove struct tcb->flags

'struct tcb' member 'flags' was only used to collect tx stats, now
we are no longer collecting those particular stats, we no longer
need tcb->flags or the code used to peek into the skb to set it's
value.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: et131x: Remove ununsed statistics
Mark Einon [Thu, 11 Sep 2014 21:59:42 +0000 (22:59 +0100)]
staging: et131x: Remove ununsed statistics

From struct ce_stats; unicast_pkts_rcvd, unicast_pkts_xmtd,
multicast_pkts_xmtd, broadcast_pkts_rcvd and broadcast_pkts_xmtd
are not returned or used for anything meaningful - remove the code
that collects them, and the struct members too.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: et131x: Tidy up rx/tx dropped & bytes stats
Mark Einon [Thu, 11 Sep 2014 21:59:41 +0000 (22:59 +0100)]
staging: et131x: Tidy up rx/tx dropped & bytes stats

Remove some fairly useless comments regarding rx/tx _bytes and
_dropped, and use rcvd_pkts_dropped stat value to provide rx_dropped.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: et131x: In et131x_tx(), don't return NETDEV_TX_BUSY, just drop the packet
Mark Einon [Thu, 11 Sep 2014 21:59:40 +0000 (22:59 +0100)]
staging: et131x: In et131x_tx(), don't return NETDEV_TX_BUSY, just drop the packet

Memory allocation errors do not denote NETDEV_TX_BUSY, simply drop
the packet silently with kfree_skb() and return NETDEV_TX_OK.

Also remove this item from the TODO list.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: et131x: Remove et131x_send_packets() function
Mark Einon [Thu, 11 Sep 2014 21:59:39 +0000 (22:59 +0100)]
staging: et131x: Remove et131x_send_packets() function

Remove et131x_send_packets() and replace the only use in et131x_tx
with the removed function's body.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>