Commit graph

50 commits

Author SHA1 Message Date
Wei Yongjun
f489e2d0ee Staging: silicom: bypasslib: remove unused including <linux/version.h>
Remove including <linux/version.h> that don't need it.

dpatch engine is used to auto generate this patch.
(https://github.com/weiyj/dpatch)

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-01 08:44:42 -07:00
Wei Yongjun
8db0bc7fc2 Staging: silicom: remove unused including <linux/version.h>
Remove including <linux/version.h> that don't need it.

dpatch engine is used to auto generate this patch.
(https://github.com/weiyj/dpatch)

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-01 08:44:42 -07:00
Chad Williamson
3e4cce9dad Staging: silicom: remove code requiring an old LINUX_VERSION_CODE
Remove all code and associated preprocessor logic dependent on an old
LINUX_VERSION_CODE since such code is dead for an in-kernel driver.

Signed-off-by: Chad Williamson <chad@dahc.us>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-29 15:01:02 -07:00
Jesper Juhl
4c0a655387 Staging: silicom: Fix up version.h includes
drivers/staging/silicom/bypasslib/bplibk.h actually uses stuff from
version.h so it should include the header.
drivers/staging/silicom/bp_proc.c and
drivers/staging/silicom/bypasslib/bypass.c currently include the
header but use nothing from it so they don't need to.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 15:57:13 -07:00
Greg Kroah-Hartman
41c66e0621 Staging: silicom: fix up compiler warnings in bp_proc.c
This removes the compiler warnings for unused variables and functions in
the bp_proc.c file.

Cc: Chad Williamson <chad@dahc.us>
Cc: Daniel Cotey <puff65537@bansheeslibrary.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 15:52:46 -07:00
Chad Williamson
6b8c8773dc staging: silicom: fix explicit intialization of procfs_dir in bp_proc.c
Remove explicit intialization of static procfs_dir to NULL, resolving a
checkpatch.pl error.

Signed-off-by: Chad Williamson <chad@dahc.us>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 15:47:54 -07:00
Chad Williamson
c460c7d946 staging: silicom: remove unnecessary braces in bp_proc.c
Remove unnecessary braces from single statement blocks in bp_proc.c,
resolving checkpatch.pl warnings.

Signed-off-by: Chad Williamson <chad@dahc.us>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 15:47:54 -07:00
Chad Williamson
ed5054b6f3 staging: silicom: remove parentheses from return statements in bg_proc.c
Remove unnecessary parentheses from return statements in bg_proc.c to
resolve checkpatch.pl errors.

Signed-off-by: Chad Williamson <chad@dahc.us>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 15:47:53 -07:00
Chad Williamson
1713eaf7fc staging: silicom: fix C99 comments in bp_proc.c
Fix C99 // comments in bp_proc.c to resolve checkpatch.pl errors.

Signed-off-by: Chad Williamson <chad@dahc.us>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 15:47:53 -07:00
Chad Williamson
19c1fb1375 staging: silicom: fix whitespace in bp_proc.c
Remove superfluous spaces in bp_proc.c to resolve checkpatch.pl errors.

Signed-off-by: Chad Williamson <chad@dahc.us>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 15:47:53 -07:00
Alan Cox
b1a4fddea0 staging: silicom: pointless check removal
bus_info is an array not a pointer. Fix silly if check

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 15:44:30 -07:00
Randy Dunlap
8fb0aebddf staging: fix silicom dependencies and build errors
Fix kconfig dependencies in silicom.  Fixes these build errors:

ERROR: "init_net" [drivers/staging/silicom/bypasslib/bypass.ko] undefined!
ERROR: "register_netdevice_notifier" [drivers/staging/silicom/bpctl_mod.ko] undefined!
ERROR: "unregister_netdevice_notifier" [drivers/staging/silicom/bpctl_mod.ko] undefined!
ERROR: "init_net" [drivers/staging/silicom/bpctl_mod.ko] undefined!
ERROR: "netdev_info" [drivers/net/mii.ko] undefined!
ERROR: "netif_carrier_on" [drivers/net/mii.ko] undefined!
ERROR: "netif_carrier_off" [drivers/net/mii.ko] undefined!

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-21 08:56:40 -07:00
Daniel Cotey
687bcca02c Staging: silicom: bp_mod.c: checkpatch cleanups: C99 comments
remove code or change to traditional comments

Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-19 09:24:10 +01:00
Daniel Cotey
7935c80c13 Staging: silicom: bp_mod.c: checkpatch cleanup: fix returns
Fix up all the returns to cannonical form, and an ifdef removal

Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-19 09:24:10 +01:00
Daniel Cotey
7c014321fd Staging: silicom: checkpatch.pl cleanup: pretty pointers
last of the unstylistic pointers cleaned up

Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-17 05:37:59 -07:00
Daniel Cotey
9f7a6f33e0 Staging: silicom: checkpatch.pl cleanup: pretty pointers
pointer style cleanup

Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-17 05:37:58 -07:00
Daniel Cotey
0920af72a7 Staging: silicom: checkpatch.pl cleanup: pretty pointers
more checkpatch cleanups of pointers.

Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-17 05:37:58 -07:00
Daniel Cotey
81908e8be4 Staging: silicom: checkpatch.pl cleanup: pretty pointers
More pointer style cleanup

Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-17 05:37:58 -07:00
Daniel Cotey
1bd5374dde Staging: silicom: checkpatch.pl cleanup: pretty pointers
More notation fixes

Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-17 05:37:58 -07:00
Daniel Cotey
01448bbb05 Staging: silicom: checkpatch.pl cleanup: pretty pointers
first chunk, straighten up the pointer notation

Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-17 05:37:58 -07:00
Daniel Cotey
86bc9ebb4d Staging: silicom: checkpatch cleanup: fix includes
checkpatch fixups

Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-17 05:37:57 -07:00
Daniel Cotey
25dd851204 Staging: silicom: checkpatch cleanup: header file whitespace
Finish trailing spaces in libbp_sd.h

Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-17 05:37:57 -07:00
Daniel Cotey
f8402b6311 Staging: silicom: checkpatch cleanup: header file whitespace
Whack all the line ending spaces so checkpatch.pl is happy.

Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-17 05:37:57 -07:00
Daniel Cotey
65af0ae35a Staging: silicom: bypass.h: checkpatch whitespace
Remove trailing spaces, second chunk

Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-17 05:37:57 -07:00
Daniel Cotey
b2774ed427 Staging: silicom: bypass.h: checkpatch whitespace
Remove trailing spaces, first chunk

Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-17 05:37:57 -07:00
Daniel Cotey
30f62902e3 Staging: silicom: bp_mod.h: checkpatch tab and space cleanup
twelfth chunk of bp_mod.h's cleanup

Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-17 05:37:56 -07:00
Daniel Cotey
d5b4f42f8f Staging: silicom: bp_mod.h: checkpatch tab and space cleanup
eleventh chunk of bp_mod.h's cleanup

Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-17 05:37:56 -07:00
Daniel Cotey
97ef0a461b Staging: silicom: bp_mod.h: checkpatch tab and space cleanup
tenth chunk of bp_mod.h's cleanup

Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-17 05:37:56 -07:00
Daniel Cotey
fab85699f3 Staging: silicom: bp_mod.h: checkpatch tab and space cleanup
ninth chunk of bp_mod.h's cleanup

Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-17 05:37:56 -07:00
Daniel Cotey
9088c8a993 Staging: silicom: bp_mod.h: checkpatch tab and space cleanup
eighth chunk of bp_mod.h's cleanup

Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-17 05:37:56 -07:00
Daniel Cotey
22f3504684 Staging: silicom: bp_mod.h: checkpatch tab and space cleanup
seventh chunk of bp_mod.h's cleanup

Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-17 05:37:55 -07:00
Daniel Cotey
0118f42af2 Staging: silicom: bp_mod.h: checkpatch tab and space cleanup
sixth chunk of bp_mod.h's cleanup

Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-17 05:37:55 -07:00
Daniel Cotey
2ea2ea4dab Staging: silicom: bp_mod.h: checkpatch tab and space cleanup
fifth chunk of bp_mod.h's cleanup

Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-17 05:37:55 -07:00
Daniel Cotey
0fe8f5d7a5 Staging: silicom: bp_mod.h: checkpatch tab and space cleanup
fourth chunk of bp_mod.h's cleanup

Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-17 05:37:55 -07:00
Daniel Cotey
c2cf19334b Staging: silicom: bp_mod.h: checkpatch tab and space cleanup
third chunk of bp_mod.h's cleanup

Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-17 05:37:55 -07:00
Daniel Cotey
7cdaac387c Staging: silicom: bp_mod.h: checkpatch tab and space cleanup
second chunk of bp_mod.h's cleanup

Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-17 05:37:54 -07:00
Daniel Cotey
490deb7927 Staging: silicom: bp_mod.h: checkpatch tab and space cleanup
first chunk of bp_mod.h's cleanup

Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-17 05:37:54 -07:00
Devendra Naga
0c4a9f6e0a staging: silicom: fix a comparing proc_dir_entry pointer against 0
we should be using the NULL macro, not 0 to compare against
a pointer value, and also remove braces around the single
if conditional after the create_proc_entry

Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-17 05:31:33 -07:00
Dan Carpenter
82e6bb0398 Staging: silicom: use kstrtoint_from_user()
The main problem with the hand rolled code was that there weren't any
range checks so you could corrupt memory by writing too much data to
the proc file.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-17 05:22:09 -07:00
Dan Carpenter
e4c536b72f Staging: silicom: add some range checks to proc functions
If you tried to cat more than 255 characters (the last character is for
the terminator) to these proc files then it would corrupt kernel memory.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-17 05:22:09 -07:00
Dan Carpenter
f325129ae9 Staging: silicom: remove S_IWOTH from proc declaration
We don't need these to be world writable or group writable.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-12 09:43:45 -07:00
Daniel Cotey
b84a9ce544 Staging: silicom: checkpatch cleanup: header tabs n spaces
Fix defines to comply with style guidelines

Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-11 14:31:52 -07:00
Daniel Cotey
13d6b7b21a Staging: silicom: minor cleanup: remove unused define
DEVICE_NODE not used

Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-11 14:31:52 -07:00
Daniel Cotey
e3845b34e8 Staging: silicom: checkpatch: cleanup macros
Fix msec_delay_bp macro formatting

Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-11 14:31:52 -07:00
DanielC
6690da5fdc Staging: silicom: Header-cleanup
Staging: silicom: Header cleanup of WD_STEP_COUNT_GET

Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-10 15:45:27 -07:00
DanielC
739309d0cd Staging: silicom: Force depend on module
Staging: silicom: Force depend on module until monolithic build fixed

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-10 11:19:34 -07:00
DanielC
6aa2039d81 Staging: silicom: C99 cleanup of libbp_sd.h
Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-07 22:15:10 -07:00
DanielC
4bf8a6c0ed Staging: silicom: C99 cleanup of bypass.h
Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-07 22:15:10 -07:00
DanielC
8b22b0b26f Staging: silicom: C99 cleanup of bp_ioctl.h
Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-07 22:15:10 -07:00
DanielC
7040e556c9 staging: add Silicom Bypass driver
The Silicom Bypass Network Interface Cards (NICs) are network cards with
paired ports (2 or 4).  The pairs either act as a "wire" allowing the
network packets to pass or insert the device in between the two ports.
When paired with the on-board hardware watchdog or other failsafe, they
provide high availability for the network in the face of software
outages or maintenance.

Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-07 22:12:43 -07:00