2015-10-27 09:17:17

by Glen Lee

Subject: [PATCH] staging: wilc1000: fix build error on SPI

wilc_netdev_init function has parameters to pass but no argument is passed
when bus type SPI is selected. Which causes build error.
This patch passes argument &wilc to the function wilc_netdev_init.

Signed-off-by: Glen Lee <[email protected]>
---
drivers/staging/wilc1000/linux_wlan.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index 9f899da..ded302a 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -1736,6 +1736,10 @@ int wilc_netdev_init(struct wilc **wilc)
/*The 1st function called after module inserted*/
static int __init init_wilc_driver(void)
{
+#ifdef WILC_SPI
+ struct wilc *wilc;
+#endif
+
#if defined(WILC_DEBUGFS)
if (wilc_debugfs_init() < 0) {
PRINT_D(GENERIC_DBG, "fail to create debugfs for wilc driver\n");
@@ -1762,7 +1766,7 @@ static int __init init_wilc_driver(void)
}
#else
PRINT_D(INIT_DBG, "Initializing netdev\n");
- if (wilc_netdev_init())
+ if (wilc_netdev_init(&wilc))
PRINT_ER("Couldn't initialize netdev\n");
return 0;
#endif
--
1.9.1

2015-10-28 05:34:32

by Sudip Mukherjee

Subject: Re: [PATCH] staging: wilc1000: fix build error on SPI

On Tue, Oct 27, 2015 at 06:20:14PM +0900, Glen Lee wrote:
> wilc_netdev_init function has parameters to pass but no argument is passed
> when bus type SPI is selected. Which causes build error.
> This patch passes argument &wilc to the function wilc_netdev_init.
>
> Signed-off-by: Glen Lee <[email protected]>
Fixes: 12ba5416dc77 ("staging: wilc1000: assign pointer of g_linux_wlan to sdio device data")

regards
sudip