Commit Graph

131 Commits

Author SHA1 Message Date
Pawel Lebioda
7bb3c79862 staging: cxt1e1: fix sbeCrc function declaration
This patch fixes the following sparse warning:

drivers/staging/cxt1e1/sbecrc.c:86:1: warning: symbol 'sbeCrc' was not declared. Should it be static?

Furthermore it fixes wring sbeCrc return type in function declaration.

Signed-off-by: Pawel Lebioda <pawel.lebioda89@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-06-26 20:35:50 -04:00
Wolfgang Ocker
6c6871eb5a staging cxt1e1: refactored ring buffer dump functions to avoid sparse warnings
Sparse spit out these warnings:

drivers/staging/cxt1e1/musycc.c:68:1: warning: context imbalance in 'musycc_dump_rxbuffer_ring' - different lock contexts for basic block
drivers/staging/cxt1e1/musycc.c:136:1: warning: context imbalance in 'musycc_dump_txbuffer_ring' - different lock contexts for basic block

The new functions musycc_dump_[rt]xbuffer_ring_locked() assume that the lock is
held. musycc_dump_[rt]xbuffer_ring() take the lock.

Signed-off-by: Wolfgang Ocker <weo@weo1.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-06-19 17:16:04 -07:00
Paul Bolle
464ae880a3 staging: ctx1e1: remove checks for three macros
When the ctx1e1 driver was added in v2.6.35 it contained checks for
CONFIG_SBE_HDLC_V7, CONFIG_SBE_WAN256T3_HDLC_V7, and
CONFIG_SBE_WAN256T3_NCOMM (and MODULE variants). The related Kconfig
symbols didn't exist then. They still don't exist now. Remove these
checks.

Do some related cleaning up and remove the unused V7() macro too.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-26 20:19:26 -07:00
Daeseok Youn
1dd3cdc7ff staging: cxt1e1: remove set a value to static variable
cleanup checkpatch.pl error:
 ERROR: do not initialise statics to 0 or NULL

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-23 20:38:43 +09:00
Daeseok Youn
a38223f4c1 staging: cxt1e1: Fix line length over 80 characters in musycc.c
clean up checkpatch.pl warning:
 WARNING: Line length over 80 characters

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-23 20:38:42 +09:00
Daeseok Youn
79cefa55a0 staging: cxt1e1: remove redundant curly braces in musycc.c
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-23 20:38:42 +09:00
Daeseok Youn
b7923d2215 staging: cxt1e1: remove dead code in musycc.c
Removes "#if 0" blocks.

And the musycc_dump_rxbuffer_ring(ch, 0) which is commented
out puts in RLD_DEBUG block and uncommented.
Because this function may be used for debugging.

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-23 20:38:42 +09:00
Daeseok Youn
2ab4b6e7ca staging: cxt1e1: Fix no spaces at the start of a line in musycc.c
clean up checkpatch.pl warning:
 WARNING: please no spaces at the start of a line in

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-23 20:38:42 +09:00
Thomas Vegas
0426a2230e staging: cxt1e1: Avoid using 0 instead of NULL
Fixed the following sparse warnings:

drivers/staging/cxt1e1/hwprobe.c:162:38:
	warning: Using plain integer as NULL pointer
drivers/staging/cxt1e1/hwprobe.c:163:38:
	warning: Using plain integer as NULL pointer
drivers/staging/cxt1e1/hwprobe.c:179:46:
	warning: Using plain integer as NULL pointer
drivers/staging/cxt1e1/hwprobe.c:184:46:
	warning: Using plain integer as NULL pointer

Signed-off-by: Thomas Vegas <thomas_75@safe-mail.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-04-26 08:42:54 -07:00
Daeseok Youn
693d963430 staging: cxt1e1: replace OS_kmalloc/OS_kfree with kzalloc/kfree
Replace OS_kmalloc/OS_kfree with kzalloc/kfree.
And also some allocation doesn't need to use GFP_DMA
so just use GFP_KERNEL.

c4_new() function is never called, remove it.

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-04-18 15:58:55 -07:00
Michael Welling
4786c87a1e STAGING: cxt1e1: Remove curly braces
Removes unnecessary curly braces from for loop in eeprom_delay.

Signed-off-by: Michael Welling <mwelling@ieee.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-04-18 15:58:32 -07:00
Michael Welling
eef74d4aaa STAGING: cxt1e1: More formatting fixes
Removes parens as are not necessary for return.

Signed-off-by: Michael Welling <mwelling@ieee.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-04-18 15:58:31 -07:00
Michael Welling
63809f5eea STAGING: cxt1e1: Formatting fixes checkpatch issues
Removes spaces before & where needed.

Signed-off-by: Michael Welling <mwelling@ieee.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-04-18 15:58:31 -07:00
Michael Welling
447d7403a6 STAGING: cxt1e1: Remove volatile variable
Removes volatile variable.

Signed-off-by: Michael Welling <mwelling@ieee.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-04-18 15:58:31 -07:00
Michael Welling
f30629812e STAGING: cxt1e1: Fixes comment blocks
Comment block fixes.

Signed-off-by: Michael Welling <mwelling@ieee.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-04-18 15:58:31 -07:00
Michael Welling
50fd8b1fa3 STAGING: cxt1e1: Indentation fixes
Indentation fixes using Lindent.

Signed-off-by: Michael Welling <mwelling@ieee.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-04-18 15:58:31 -07:00
Michael Welling
9200b4dadb STAGING: cxt1e1: Remove sparse warnings
Removes sparse warnings by including a header and adding static to some functions.

Signed-off-by: Michael Welling <mwelling@ieee.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-04-18 15:58:30 -07:00
Matei Oprea
542ef8a6fb staging: cxt1e1: hwprobe: fix incorrect type in assignment
This patch fixes "incorrect type in argument 1" warning from sparse.

Signed-off-by: Matei Oprea <eu@opreamatei.ro>
Cc: ROSEdu Kernel Community <firefly@lists.rosedu.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-04-18 15:58:30 -07:00
Ebru Akagunduz
07c452d4b9 Staging: cxt1e1: Fix externs should be avoided in .c files in comet.c
Fix checkpatch.pl issues with externs should be
avoided in comet.c

Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:17:23 -07:00
Ebru Akagunduz
7184aa9dbe Staging: cxt1e1: Fix use of volatile is usually wrong in comet.c
Fix checkpatch.pl issues with use of volatile is
usually wrong in comet.c

Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:17:23 -07:00
Daeseok Youn
2ebd09aced staging: cxt1e1: remove unneeded mkret() calls
The mkret() change a value of error from positive to
negative. This patch is modified to return negative value
when it failed. It doesn't need to call with function
for changing from positive to negative.

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18 13:05:13 -07:00
Himangi Saraogi
4d7af37672 staging: cxt1e1: Fix Sparse Warning for Static Declarations in linux.c
This patch fixes the following sparse warnings:
drivers/staging/cxt1e1/linux.c:106:13: warning: symbol 'log_level_default' was not declared. Should it be static?
drivers/staging/cxt1e1/linux.c:110:13: warning: symbol 'max_mru_default' was not declared. Should it be static?
drivers/staging/cxt1e1/linux.c:255:1: warning: symbol 'c4_linux_interrupt' was not declared. Should it be static?
drivers/staging/cxt1e1/linux.c:265:1: warning: symbol 'c4_ebus_interrupt' was not declared. Should it be static?

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18 10:42:34 -07:00
Gulsah Kose
56bfef43d9 staging: cxt1e1: Fix do not use // c99 comments
This patch fixes "do not use // C99 comments" errors in linux.c

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18 10:40:26 -07:00
Gulsah Kose
9d9c1c2452 staging: cxt1e1: Fix line over 80 characters.
Fix checkpatch.pl issues with line over 80
characters in comet.c

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18 10:38:29 -07:00
Daeseok Youn
5ddd113297 staging: cxt1e1: remove redundant memset() call
The banner array doens't need to set to 0.
sprintf() adds a terminating '\0'.

And the sn array can be declared and initialized to zero.
So remove redundant memset() with zero.

Remove unnecessary cast for memcpy().

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-17 14:22:47 -07:00
Daeseok Youn
14eec44430 staging: cxt1e1: remove redundant memset() call
The name array doens't need to set to 0. Because
sprintf/snprintf adds a terminating '\0'.

And also it doesn't need to assign name array
address to np pointer.

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-17 14:22:47 -07:00
Greg Kroah-Hartman
e40bffaeae Merge 3.14-rc7 into staging-next
This resolves a merge issue with drivers/staging/cxt1e1/linux.c that was
fixed in a report from Stephen Rothwell

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-17 11:27:39 -07:00
Gulsah Kose
0a6088c3e6 staging: cxt1e1: Fix space prohibited between function name and open parenthesis
Fix checkpatch.pl issues with space prohibited between function name and
open parenthesis in libsbew.h

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-16 22:04:48 -07:00
Chi Pham
24e7d79901 staging: cxt1e1: Removed assignments from if statements.
Assignments removed from if statements.
Fixed checkpatch warning such as indentation and negative error returns in
adjacent code.

Coccinelle was used for this patch. The following script found the match:
@simple@
expression E1, E2;
statement S1, S2;
@@

+ E1 = E2;
  if (
-     (E1 = E2)
+     E1
     )
  S1 else S2

@left@
expression E0, E1, E2;
statement S1, S2;
@@

+ E1 = E2;
  if (
-     (E1 = E2)
+     E1
         == E0
     )
  S1 else S2

Signed-off-by: Chi Pham <fempsci@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-13 17:44:45 -07:00
Himangi Saraogi
639296ba38 staging:cxt1e1:remove unused code with #if 0
The functions musycc_del_chan and musycc_del_chan_stats
are not being used at the moment and may not be required.
Remove them for now (with #if 0) till it is decided whether
it is really required.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-13 16:06:39 -07:00
Shaun Laing
d66b744ac6 staging: cxt1e1: change declaration of TWV_table
Changes the declaration of TWV_table to 'static void' to eliminate a sparse
"should it be static" warning.

Signed-off-by: Shaun Laing <shaun@xresource.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-08 22:39:41 -08:00
Daeseok Youn
61b0f7e5b5 staging: cxt1e1: fix checkpatch errors with open brace '{'
clean up checkpatch.pl error in linux.c:
 ERROR: that open brace { should be on the previous line

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-08 22:34:15 -08:00
Daeseok Youn
ccf0119c95 staging: cxt1e1: fix checkpatch error 'assignment in if condition'
checkpatch.pl error in linux.c:
 ERROR: do not use assignment in if condition

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-08 22:34:15 -08:00
Himangi Saraogi
b0d9142b17 Staging:cxt1e1:musycc:remove assignment in if condition
This patch removes the assignment in if conditions to do away with the
checkpatch warning :'do not use assignment in if condition'.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-07 13:27:06 -08:00
Shaun Laing
1fa21a79b5 staging: cxt1e1: removed version string declaration
Removed the unneeded pmcc4_OSSI_release version string, as well as the now
unused 'release' element of the sbe_card_info struct.  This also resolves a
sparse "should it be static" warning.

Signed-off-by: Shaun Laing <shaun@xresource.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-06 11:58:32 -08:00
Shaun Laing
553a518931 staging: cxt1e1: Add extern keyword for sparse 'static' warning
Resolve sparse "warning: symbol '...' was not declared.  Should it be static?"
messages.  Includes "comet_tables.h", which contains extern declarations for
the variables defined in comet_tables.c.

Signed-off-by: Shaun Laing <shaun@xresource.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-04 16:35:37 -08:00
Daeseok Youn
293ed4614a staging: cxt1e1: Fix line length over 80 characters in linux.c
clean up checkpatch.pl warnings:
 WARNING: Line length over 80 characters

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-04 16:32:11 -08:00
Daeseok Youn
aa562fa709 staging: cxt1e1: Fix no spaces at the start of a line in linux.c
clean up checkpatch.pl warnings:
 WARNING: please no spaces at the start of a line in

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-04 16:32:11 -08:00
Daeseok Youn
922b81b835 staging: cxt1e1: remove space between function name and parenthesis
clean up checkpatch.pl warnings in linux.c:
 WARNING: space prohibited between function name
 and open parenthesis '('

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-04 16:32:10 -08:00
Daeseok Youn
53261926fb staging: cxt1e1: fix checkpatch errors with open brace '{'
clean up checkpatch.pl error:
 ERROR: that open brace { should be on the previous line

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-04 16:30:43 -08:00
Daeseok Youn
418af0dc20 staging: cxt1e1: fix checkpatch error 'assignment in if condition'
checkpatch.pl error:
 ERROR: do not use assignment in if condition

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-04 16:30:43 -08:00
Daeseok Youn
532fdaa274 Staging: cxt1e1: Fix line length over 80 characters in hwprobe.c
clean up checkpatch.pl warnings:
 WARNING: Line length over 80 characters

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-04 16:30:43 -08:00
Salva Peiró
084b6e7765 staging/cxt1e1/linux.c: Correct arbitrary memory write in c4_ioctl()
The function c4_ioctl() writes data from user in ifr->ifr_data
to the kernel struct data arg, without any iolen bounds checking.
This can lead to a arbitrary write outside of the struct data arg.
Corrected by adding bounds-checking of iolen before the copy_from_user().

Signed-off-by: Salva Peiró <speiro@ai2.upv.es>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-04 16:20:01 -08:00
Daeseok Youn
aee0bda81b staging: cxt1e1: Fix no spaces at the start of a line in hwprobe.c
clean up checkpatch.pl warnings:
WARNING: please no spaces at the start of a line in

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-28 14:18:58 -08:00
Daeseok Youn
37cc9913d8 staging: cxt1e1: remove space between function name and parenthesis
clean up checkpatch.pl warnings:
 WARNING: space prohibited between function name
 and open parenthesis '('

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-28 14:18:29 -08:00
Daeseok Youn
252ed5c1a1 staging: cxt1e1: remove unused variable
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-28 14:18:29 -08:00
Monam Agarwal
f5bde4476b Staging: cxt1e1: Fix line length over 80 characters in functions.c
This patch fixes the following checkpatch.pl warning in functions.c
WARNING: Line length over 80 characters

Signed-off-by: Monam Agarwal <monamagarwal123@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-27 08:39:27 -08:00
Monam Agarwal
08e624a092 Staging: cxt1e1: Fix space prohibited between function name and open parenthesis '('
This patch fixes the following checkpatch.pl warning in functions.c
WARNING: space prohibited between function name and open parenthesis '('

Signed-off-by: Monam Agarwal <monamagarwal123@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-27 08:39:27 -08:00
Monam Agarwal
bc4d6dafa5 Staging: cxt1e1: Fix no spaces at the start of a line in functions.c
This patch fixes the following checkpatch.pl warning in functions.c
WARNING: please no spaces at the start of a line in

Signed-off-by: Monam Agarwal <monamagarwal123@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-27 08:39:27 -08:00
SeongJae Park
ce8386da74 staging: cxt1e1: remove unnecessary function, VMETRO_TRACE
VMETRO_TRACE isn't called from anywhere. So delete it.

Signed-off-by: SeongJae Park <sj38.park@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-07 10:44:30 -08:00