projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
47a466f
)
staging: wilc1000: wilc_wlan_init: add argument net_device
author
Glen Lee
<glen.lee@atmel.com>
Thu, 29 Oct 2015 03:18:48 +0000
(12:18 +0900)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Mon, 16 Nov 2015 04:02:47 +0000
(20:02 -0800)
This patch adds new argument struct net_device and pass the function dev.
Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wilc1000/wilc_wlan.c
patch
|
blob
|
history
diff --git
a/drivers/staging/wilc1000/wilc_wlan.c
b/drivers/staging/wilc1000/wilc_wlan.c
index 5a480a123acd8cf0dbf437a88c929cf9ea8fe30c..16224cefea7914cdd0cf0e57c57d6410d57b4d05 100644
(file)
--- a/
drivers/staging/wilc1000/wilc_wlan.c
+++ b/
drivers/staging/wilc1000/wilc_wlan.c
@@
-1870,7
+1870,7
@@
void wilc_bus_set_default_speed(void)
/* Restore bus speed to default. */
g_wlan.hif_func.hif_set_default_bus_speed();
}
-u32 init_chip(
void
)
+u32 init_chip(
struct net_device *dev
)
{
u32 chipid;
u32 reg, ret = 0;
@@
-2028,7
+2028,7
@@
int wilc_wlan_init(struct net_device *dev, wilc_wlan_inp_t *inp)
}
#endif
- if (!init_chip()) {
+ if (!init_chip(
dev
)) {
/* EIO 5 */
ret = -5;
goto _fail_;