Commit Graph

122 Commits

Author SHA1 Message Date
Sunhee Hwang
9385f21b29 Staging: csr: fix code indent coding style issues in csr_wifi_hip_signals.h
This is a patch that fixes up code indent coding style warnings
in the csr_wifi_hip_signals.h found by checkpatch.pl tool.

Signed-off-by: Sunhee Hwang <sunheehwang821@gmail.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 14:48:14 -07:00
Jugwan Eom
906836f6e3 Staging: csr: csr_wifi_router_ctrl_sef.c: fix line over 80 characters
This patch fixes line over 80 characters problem found by checkpatch.pl
tool.

Signed-off-by: Jugwan Eom <zugwan@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 14:46:49 -07:00
Jugwan Eom
057ed67170 Staging: csr: csr_wifi_router_ctrl_sef.c: fix tab mess
This patch converts spaces to tabs.

Signed-off-by: Jugwan Eom <zugwan@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 14:46:49 -07:00
Jugwan Eom
86a598cd86 Staging: csr: csr_wifi_router_ctrl_sef.c: fix up brace placement
This patch fixes a brace placement error found by checkpatch.pl tool.

Signed-off-by: Jugwan Eom <zugwan@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 14:46:48 -07:00
Sangho Yi
0288f91dbb staging: csr: csr_wifi_sme_sef.h: fixed indentation warnings
Fixed indentation warnings on comments

Signed-off-by: Sangho Yi <antiroot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 14:43:54 -07:00
Sangho Yi
9bf8ff7f18 staging: csr: csr_wifi_sme_serialize.h: fixed indentation warnings
Fixed indentation warnings from the comments.

Signed-off-by: Sangho Yi <antiroot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 14:43:54 -07:00
Sangho Yi
f0dbd1dcb1 staging: csr: csr_wifi_sme_sef.h: Fixed lines over 80 chars per line
Fixed lines over 80 characters per line.

Signed-off-by: Sangho Yi <antiroot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 14:43:54 -07:00
Sangho Yi
1ac80e498a staging: csr: csr_wifi_sme_sef.h: Fixed from foo* bar to foo *bar
Fixed coding style errors like foo* bar to foo *bar for the definition
of input and output variables of the function interfaces.

Signed-off-by: Sangho Yi <antiroot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 14:43:53 -07:00
Sangho Yi
6b74b192f6 staging: csr: csr_wifi_sme_serialize.h: fixed over 80 char lines
Appropriately modified the lines over 80 characters.

Signed-off-by: Sangho Yi <antiroot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 14:43:53 -07:00
Sangho Yi
095cc7143d staging: csr: csr_wifi_sme_serialize.h: Fixed from foo* bar to foo *bar
Fixed the coding style convention warnings for the statements of the
pointer variable declaration.

Signed-off-by: Sangho Yi <antiroot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 14:43:53 -07:00
Sangho Yi
9851c29c7f staging: csr: csr_wifi_sme_task.h: fixed indentation coding style
Removed coding style warnings occurred on the comments.

Signed-off-by: Sangho Yi <antiroot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 14:43:53 -07:00
Sangho Yi
936a8b4c29 Drivers: Staging: CSR: fixed coding style errors in csr_wifi_router_free_upstream_contents.c
Originally there were a lot of coding style errors so, I cleaned up the
coding style errors including braces and indentations.

Signed-off-by: Sangho Yi <antiroot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 14:01:42 -07:00
Sunhee Hwang
ae485c27c7 Staging: csr: fix pointer(asterisk) position coding style issue in sme_userspace.h
This is a patch in the sme_userspace.h that fixes up
a pointer(asterisk) position warning found by checkpatch.pl tool

Signed-off-by: Sunhee Hwang <sunheehwang821@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 13:59:05 -07:00
SeongJae Park
cf174b0ef5 staging: csr: csr_framework_ext_types.h: fix coding style
Fix coding style of csr_framework_ext_types.h
    
Signed-off-by: SeongJae Park <sj38.park@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 13:58:10 -07:00
Sangho Yi
3f38ea7de4 Staging: CSR: csr_time.h: Removed unnecessary typedef struct
I removed the unnecessary typedef struct from the csr_time.h.
There is no actual usage of the typedef definition.

Signed-off-by: Sangho Yi <antiroot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 13:53:53 -07:00
Sangho Yi
7177572556 Staging: CSR: csr_time.h: fixed indentation warnings based on coding style
I fixed the indentation warnings on csr_time.h.

Signed-off-by: Sangho Yi <antiroot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 13:53:09 -07:00
Greg Kroah-Hartman
0567e1ec43 Staging: csr: data_tx: remove extra space in printk
This saves us 1 byte!

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 13:48:04 -07:00
Greg Kroah-Hartman
dbff11c9d3 Staging: csr: data_tx: fix up brace placement
This cleans up the brace placement coding issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 13:48:04 -07:00
Greg Kroah-Hartman
7c5745cc08 Staging: csr: data_tx: clean up tab mess
This patch converts spaces to tabs.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 13:48:04 -07:00
Homin Lee
60ac2e9f7f Staging: csr: csr_log_configure.h: clean up tab mess
Signed-off-by: Homin Lee <homin.lee@suapapa.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-22 13:48:04 -07:00
Wei Yongjun
36dab6e5f0 staging: csr: 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-10-22 13:48:04 -07:00
Adam Buchbinder
bff6c3e00c staging: Fix spelling of "asynchronous" in comments.
"Asychronous" is misspelled in some comments. No code changes.

Signed-off-by: Adam Buchbinder <adam.buchbinder@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-21 08:56:41 -07:00
Lauri Hintsala
2b5d20db81 staging: csr: wait for the exec in usermodehelper
The order of wait values has been changed by commit 9d944ef32e.
Fix the wait parameter and start to use a define instead of
"magic number".

Signed-off-by: Lauri Hintsala <lauri.hintsala@bluegiga.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-17 14:50:33 -07:00
Randy Dunlap
8ab92cbdb3 staging: fix csr printk format warning
Fix printk format warning on i386/X86_32 by using 't' for ptrdiff_t.
Also builds cleanly on x86_64.

drivers/staging/csr/csr_wifi_hip_udi.c: In function 'unifi_print_status':
drivers/staging/csr/csr_wifi_hip_udi.c:151:27: warning: format '%ld' expects type 'long int', but argument 5 has type 'int'

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-17 14:50:33 -07:00
Devendra Naga
7cd4e8c577 staging: csr: replace calls to kmalloc and memset with kzalloc
the kzalloc does allocates memory and sets the data at the memory
which is allocated to 0,

The driver does uses the kmalloc and memset at some points in the code
replace them with a single call to kzalloc

Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
Acked-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04 14:35:05 -07:00
Devendra Naga
6f6ed3db33 staging: csr: remove casting of return value from kmalloc
as per Documentation/CodingStyle, casting of void pointer to
any other pointer is not needed

Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
Acked-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04 14:35:05 -07:00
Priit Laes
34f86d06f0 staging: csr: Remove all leftover kernel version checks \o/
Signed-off-by: Priit Laes <plaes@plaes.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04 14:33:52 -07:00
Priit Laes
4febd649bb staging: csr: Remove unneeded UF_NETIF_TX_* macros
Signed-off-by: Priit Laes <plaes@plaes.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04 14:31:21 -07:00
Priit Laes
59e6201d38 staging: csr: unifi_priv.h: Remove KERNEL_VERSION checks
Signed-off-by: Priit Laes <plaes@plaes.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04 14:31:21 -07:00
Priit Laes
457d404c0a staging: csr: unifi_wext.h: Remove KERNEL_VERSION checks
Signed-off-by: Priit Laes <plaes@plaes.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04 14:31:21 -07:00
Priit Laes
b5008ae237 staging: csr: drv.c: Remove KERNEL_VERSION checks and associated defines
Signed-off-by: Priit Laes <plaes@plaes.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04 14:31:21 -07:00
Priit Laes
6e9950a62b staging: csr: Drop unused UNIFI_NET_NAME configuration option
Signed-off-by: Priit Laes <plaes@plaes.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04 14:31:21 -07:00
Priit Laes
6e5e4043bc staging: csr: remove unused define ALLOW_Q_PAUSE
Signed-off-by: Priit Laes <plaes@plaes.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04 14:31:21 -07:00
Priit Laes
879a901f7e staging: csr: netdev.c: Clean up KERNEL_VERSION checks: 2.6.37
Signed-off-by: Priit Laes <plaes@plaes.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04 14:30:16 -07:00
Priit Laes
6d99c525a0 staging: csr: netdev.c: Clean up KERNEL_VERSION checks: 2.6.34
Signed-off-by: Priit Laes <plaes@plaes.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04 14:30:16 -07:00
Priit Laes
99b2c9d77e staging: csr: netdev.c: Clean up KERNEL_VERSION checks: 2.6.32
Signed-off-by: Priit Laes <plaes@plaes.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04 14:30:15 -07:00
Priit Laes
96bc8c7ab8 staging: csr: netdev.c: Clean up KERNEL_VERSION checks: 2.6.29
Signed-off-by: Priit Laes <plaes@plaes.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04 14:30:15 -07:00
Priit Laes
a1a18726f4 staging: csr: netdev.c: Clean up KERNEL_VERSION checks: 2.6.28
Signed-off-by: Priit Laes <plaes@plaes.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04 14:30:15 -07:00
Priit Laes
58abe64fcf staging: csr: netdev.c: Clean up KERNEL_VERSION checks: 2.6.27
Signed-off-by: Priit Laes <plaes@plaes.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04 14:30:15 -07:00
Priit Laes
0505c63d3a staging: csr: netdev.c: Clean up KERNEL_VERSION checks: <=2.6.25
Signed-off-by: Priit Laes <plaes@plaes.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04 14:30:15 -07:00
Wei Yongjun
6a5c23194e staging: csr: use is_zero_ether_addr() instead of memcmp()
Using is_zero_ether_addr() instead of directly use
memcmp() to determine if the ethernet address is all
zeros.

spatch with a semantic match is used to found this problem.
(http://coccinelle.lip6.fr/)

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04 14:14:08 -07:00
Wei Yongjun
c8be681fad staging: csr: fix possible memory leak in do_patch_convert_download()
pfw has been allocated in function xbv_to_patch() and should be
freed before leaving from the error handling cases.

spatch with a semantic match is used to found this problem.
(http://coccinelle.lip6.fr/)

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-04 14:14:07 -07:00
Greg Kroah-Hartman
8f8b77bfdc Merge 3.6-rc3 into staging-next
This picks up fixes we want in this branch to allow us to properly test.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-08-27 07:10:40 -07:00
Devendra Naga
c4f9e64456 staging:csr: remove usage of CsrSnprintf and use scnprintf
This change tries to achieve the removal of the csr driver defined snprintf
and uses the kernel defined snprintf.

After this change i got following build warnings, which are solved in this patch

warnings generated:

drivers/staging/csr/io.c:929:13: warning: format ‘%lu’ expects type ‘long unsigned int’, but argument 4 has type ‘u32’
drivers/staging/csr/io.c:929:13: warning: format ‘%lu’ expects type ‘long unsigned int’, but argument 5 has type ‘u32’
drivers/staging/csr/csr_wifi_hip_udi.c: In function ‘unifi_print_status’:
drivers/staging/csr/csr_wifi_hip_udi.c:78:27: warning: format ‘%lu’ expects type ‘long unsigned int’, but argument 4 has type ‘u32’
drivers/staging/csr/csr_wifi_hip_udi.c:151:27: warning: format ‘%u’ expects type ‘unsigned int’, but argument 5 has type ‘long int’
drivers/staging/csr/csr_wifi_hip_udi.c:257:27: warning: format ‘%lu’ expects type ‘long unsigned int’, but argument 4 has type ‘u32’
drivers/staging/csr/csr_wifi_hip_udi.c:257:27: warning: format ‘%lu’ expects type ‘long unsigned int’, but argument 5 has type ‘u32’
drivers/staging/csr/csr_wifi_hip_udi.c:261:27: warning: format ‘%lu’ expects type ‘long unsigned int’, but argument 4 has type ‘u32’

Signed-off-by: Devendra Naga <develkernel412222@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-08-16 11:39:00 -07:00
Greg Kroah-Hartman
8607dcbefb staging: csr: add INET dependancy
Randy noticed that with CONFIG_INET turned off, the following build
errors happen:
	ERROR: "register_inetaddr_notifier" [drivers/staging/csr/csr_wifi.ko] undefined!
	ERROR: "unregister_inetaddr_notifier" [drivers/staging/csr/csr_wifi.ko] undefined!

Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-08-14 16:53:21 -07:00
Jesper Juhl
3d4e9e57e6 staging: csr: Fix up version.h includes
Include version.h where actually needed, remove where unneeded.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-08-13 18:57:44 -07:00
Devendra Naga
a6c42258ac staging/csr: fix coding style problems in handle_bh_error
the following fixes:

* fix line over 80
* fix no space at start of line
* use tabs instead of spaces
* no need of opening & closing braces for single statement if block

Cc: Mikko Virkkilä <mikko.virkkila@bluegiga.com>
Cc: Lauri Hintsala <Lauri.Hintsala@bluegiga.com>
Cc: Riku Mettälä <riku.mettala@bluegiga.com>
Cc: Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com>
Signed-off-by: Devendra Naga <develkernel412222@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-08-13 18:57:44 -07:00
Devendra Naga
be21a084c1 staging/csr: remove the initialisation of interfaceTag and its comment in handle_bh_error
the interfaceTag is actually initialised in for loop of this function
and its not needed to initialise it before for loop.

and also remove the comment that is obvious about this variable.

Cc: Mikko Virkkilä <mikko.virkkila@bluegiga.com>
Cc: Lauri Hintsala <Lauri.Hintsala@bluegiga.com>
Cc: Riku Mettälä <riku.mettala@bluegiga.com>
Cc: Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com>
Signed-off-by: Devendra Naga <develkernel412222@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-08-13 18:57:44 -07:00
Devendra Naga
b29687fb88 staging/csr: fix coding style problems in uf_wait_for_thread_to_stop
the following fixes:

* fix no space at the start of line
* line over 80 characters
* use tabs instead of spaces at starting of every line

Cc: Mikko Virkkilä <mikko.virkkila@bluegiga.com>
Cc: Lauri Hintsala <Lauri.Hintsala@bluegiga.com>
Cc: Riku Mettälä <riku.mettala@bluegiga.com>
Cc: Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com>
Signed-off-by: Devendra Naga <develkernel412222@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-08-13 18:57:44 -07:00
Devendra Naga
f7523ab6c0 staging/csr: fix coding style problems in uf_stop_thread
The following warnings and errors were fixed:

* fix no space at the start of a line
* fix line over 80 characters
* use tabs instead of spaces

Cc: Mikko Virkkilä <mikko.virkkila@bluegiga.com>
Cc: Lauri Hintsala <Lauri.Hintsala@bluegiga.com>
Cc: Riku Mettälä <riku.mettala@bluegiga.com>
Cc: Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com>
Signed-off-by: Devendra Naga <develkernel412222@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-08-13 18:57:44 -07:00