diff mbox

[16/16] staging: wilc1000: assign pointer of wl to sdio device data

Message ID 1444823204-16736-16-git-send-email-tony.cho@atmel.com (mailing list archive)
State Not Applicable
Delegated to: Kalle Valo
Headers show

Commit Message

Tony Cho Oct. 14, 2015, 11:46 a.m. UTC
From: Glen Lee <glen.lee@atmel.com>

This patch assigns wl pointer to sdio device data. The global variable wl will
be removed finally.

Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
 drivers/staging/wilc1000/linux_wlan.c         | 3 ++-
 drivers/staging/wilc1000/linux_wlan_sdio.c    | 5 +++--
 drivers/staging/wilc1000/wilc_wfi_netdevice.h | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

Comments

kernel test robot Oct. 17, 2015, 8:21 a.m. UTC | #1
Hi Glen,

[auto build test ERROR on staging/staging-next -- if it's inappropriate base, please suggest rules for selecting the more suitable base]

url:    https://github.com/0day-ci/linux/commits/Tony-Cho/staging-wilc1000-remove-extern-declarations-of-g_linux_wlan/20151014-195239
config: i386-randconfig-c0-10171523 (attached as .config)
reproduce:
        # save the attached .config to linux build tree
        make ARCH=i386 

All errors (new ones prefixed by >>):

   drivers/staging/wilc1000/linux_wlan.c: In function 'init_wilc_driver':
>> drivers/staging/wilc1000/linux_wlan.c:1743:6: error: too few arguments to function 'wilc_netdev_init'
     if (wilc_netdev_init())
         ^
   drivers/staging/wilc1000/linux_wlan.c:1619:5: note: declared here
    int wilc_netdev_init(struct wilc **wilc)
        ^

vim +/wilc_netdev_init +1743 drivers/staging/wilc1000/linux_wlan.c

c5c77ba1 Johnny Kim 2015-05-11  1737  			PRINT_D(INIT_DBG, "init_wilc_driver: Failed register sdio driver\n");
c5c77ba1 Johnny Kim 2015-05-11  1738  
c5c77ba1 Johnny Kim 2015-05-11  1739  		return ret;
c5c77ba1 Johnny Kim 2015-05-11  1740  	}
c5c77ba1 Johnny Kim 2015-05-11  1741  #else
c5c77ba1 Johnny Kim 2015-05-11  1742  	PRINT_D(INIT_DBG, "Initializing netdev\n");
fc4b95d6 Kim, Leo   2015-07-28 @1743  	if (wilc_netdev_init())
c5c77ba1 Johnny Kim 2015-05-11  1744  		PRINT_ER("Couldn't initialize netdev\n");
c5c77ba1 Johnny Kim 2015-05-11  1745  	return 0;
c5c77ba1 Johnny Kim 2015-05-11  1746  #endif

:::::: The code at line 1743 was first introduced by commit
:::::: fc4b95d69c603668331d1edb92e3fb0dbcb1d959 staging: wilc1000: remove braces {} for single statement blocks

:::::: TO: Kim, Leo <leo.kim@atmel.com>
:::::: CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
diff mbox

Patch

diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index 4708d44..3cc4861 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -1616,7 +1616,7 @@  void wl_wlan_cleanup(void)
 	linux_wlan_device_power(0);
 }
 
-int wilc_netdev_init(void)
+int wilc_netdev_init(struct wilc **wilc)
 {
 
 	int i;
@@ -1629,6 +1629,7 @@  int wilc_netdev_init(void)
 	wl = kzalloc(sizeof(*wl), GFP_KERNEL);
 	if (!wl)
 		return -ENOMEM;
+	*wilc = wl;
 
 	register_inetaddr_notifier(&g_dev_notifier);
 
diff --git a/drivers/staging/wilc1000/linux_wlan_sdio.c b/drivers/staging/wilc1000/linux_wlan_sdio.c
index 7fd53be..45342e8 100644
--- a/drivers/staging/wilc1000/linux_wlan_sdio.c
+++ b/drivers/staging/wilc1000/linux_wlan_sdio.c
@@ -27,7 +27,6 @@  struct wilc_sdio {
 };
 
 struct sdio_func *local_sdio_func;
-extern int wilc_netdev_init(void);
 extern void wilc_handle_isr(void);
 
 static unsigned int sdio_default_speed;
@@ -117,6 +116,7 @@  int linux_sdio_cmd53(sdio_cmd53_t *cmd)
 static int linux_sdio_probe(struct sdio_func *func, const struct sdio_device_id *id)
 {
 	struct wilc_sdio *wl_sdio;
+	struct wilc *wilc;
 
 	PRINT_D(INIT_DBG, "probe function\n");
 	wl_sdio = kzalloc(sizeof(struct wilc_sdio), GFP_KERNEL);
@@ -125,12 +125,13 @@  static int linux_sdio_probe(struct sdio_func *func, const struct sdio_device_id
 
 	PRINT_D(INIT_DBG, "Initializing netdev\n");
 	local_sdio_func = func;
-	if (wilc_netdev_init()) {
+	if (wilc_netdev_init(&wilc)) {
 		PRINT_ER("Couldn't initialize netdev\n");
 		kfree(wl_sdio);
 		return -1;
 	}
 	wl_sdio->func = func;
+	wl_sdio->wilc = wilc;
 	sdio_set_drvdata(func, wl_sdio);
 
 	printk("Driver Initializing success\n");
diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
index a6b948a..9a9e082 100644
--- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
+++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
@@ -214,4 +214,5 @@  void linux_wlan_rx_complete(void);
 void linux_wlan_dbg(u8 *buff);
 int linux_wlan_lock_timeout(void *vp, u32 timeout);
 void wl_wlan_cleanup(void);
+int wilc_netdev_init(struct wilc **wilc);
 #endif