Skip to contentSkip to conversation

Staging: wilc1000: Fix build break due to undeclared *wilc and implicit declaration of init_irq

PATCH In review Punit Vara 4 participants 16 messages Nov 8, 2015 – Dec 2, 2015 Staging

lore
Share & tools
lore

Punit Vara

author
#0 lore raw

PATCH v2 1/1 Staging: wilc1000: Fix build break due to undeclared *wilc and implicit declaration of init_irq

This patch is to the linux_wlan.c file that fixes up break found during make drivers/staging/wilc1000/linux_wlan.o

Patch add following things to file :
-init_irq declaration
-At preprocessor (!defined WILC_SDIO) to defination of init_irq -At preprocessor (!defined WILC_SDIO) to defination isr_uh_routine -removes unnecessary lines to declare *wilc

Patch fixes 702c0e50f and 2c1d05d10 tags.

---
-Fixes tag added suggested by Dan carpenter.
-Remove declaration of autovariable with same type and same name suggested by Joe Perches

 drivers/staging/wilc1000/linux_wlan.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/staging/wilc1000/linux_wlan.c +6 -4
index 086f1db..5bd14ed 100644
@@ -208,7 +208,7 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event
 	return NOTIFY_DONE;
 }
 
-#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO)
+#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO) || (!defined WILC_SDIO)
 static irqreturn_t isr_uh_routine(int irq, void *user_data)
 {
 	perInterface_wlan_t *nic;
@@ -246,7 +246,7 @@ irqreturn_t isr_bh_routine(int irq, void *userdata)
 	return IRQ_HANDLED;
 }
 
-#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO)
+#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO) || (!defined WILC_SDIO)
 static int init_irq(struct net_device *dev)
 {
 	int ret = 0;
@@ -937,6 +937,10 @@ static void wlan_deinitialize_threads(struct net_device *dev)
 	}
 }
 
+#if (!defined WILC_SDIO) || (defined WILC_SDIO_IRQ_GPIO)
+static int init_irq(struct net_device *dev);
+#endif
+
 int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t *p_nic)
 {
 	wilc_wlan_inp_t nwi;
@@ -1578,9 +1582,7 @@ int wilc_netdev_init(struct wilc **wilc)
 
 static int __init init_wilc_driver(void)
 {
-#ifdef WILC_SPI
 	struct wilc *wilc;
-#endif
 
 #if defined(WILC_DEBUGFS)
 	if (wilc_debugfs_init() < 0) {
Signature · 1 line
2.6.2
#1 lore raw

Top posting beucase I am a bad person. Punit, you should have CC'd Glen since this is his code.

The fix is still not right. It will cause an unused variable warning on some configs.

To be honest, this code makes no sense. Why do we even have the wilc variable in this function when we never use it? Just declare move it to wilc_netdev_init(). Also there are too many ifdefs in this code.

regards,
dan carpenter

Quoted 69 lines · Punit Vara

This patch is to the linux_wlan.c file that fixes up break found during make drivers/staging/wilc1000/linux_wlan.o

Patch add following things to file :

(quoted diff) +0 -4
-init_irq declaration
-At preprocessor (!defined WILC_SDIO) to defination of init_irq
-At preprocessor (!defined WILC_SDIO) to defination isr_uh_routine
-removes unnecessary lines to declare *wilc

Patch fixes 702c0e50f and 2c1d05d10 tags.

---

(quoted diff) +0 -2
-Fixes tag added suggested by Dan carpenter.
-Remove declaration of autovariable with same type and same name suggested by Joe Perches
 
 drivers/staging/wilc1000/linux_wlan.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/staging/wilc1000/linux_wlan.c +6 -4
index 086f1db..5bd14ed 100644
@@ -208,7 +208,7 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event
 	return NOTIFY_DONE;
 }
 
-#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO)
+#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO) || (!defined WILC_SDIO)
 static irqreturn_t isr_uh_routine(int irq, void *user_data)
 {
 	perInterface_wlan_t *nic;
@@ -246,7 +246,7 @@ irqreturn_t isr_bh_routine(int irq, void *userdata)
 	return IRQ_HANDLED;
 }
 
-#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO)
+#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO) || (!defined WILC_SDIO)
 static int init_irq(struct net_device *dev)
 {
 	int ret = 0;
@@ -937,6 +937,10 @@ static void wlan_deinitialize_threads(struct net_device *dev)
 	}
 }
 
+#if (!defined WILC_SDIO) || (defined WILC_SDIO_IRQ_GPIO)
+static int init_irq(struct net_device *dev);
+#endif
+
 int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t *p_nic)
 {
 	wilc_wlan_inp_t nwi;
@@ -1578,9 +1582,7 @@ int wilc_netdev_init(struct wilc **wilc)
 
 static int __init init_wilc_driver(void)
 {
-#ifdef WILC_SPI
 	struct wilc *wilc;
-#endif
 
 #if defined(WILC_DEBUGFS)
 	if (wilc_debugfs_init() < 0) {
Signature · 6 lines
2.6.2

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
#2 lore raw

I just check the email, I will get back here after I check the patches related with this issue.

regards,
glen lee.

Quoted 83 lines · Dan Carpenter

Top posting beucase I am a bad person. Punit, you should have CC'd Glen since this is his code.

The fix is still not right. It will cause an unused variable warning on some configs.

To be honest, this code makes no sense. Why do we even have the wilc variable in this function when we never use it? Just declare move it to wilc_netdev_init(). Also there are too many ifdefs in this code.

regards,
dan carpenter

Quoted 69 lines · Punit Vara

This patch is to the linux_wlan.c file that fixes up break found during make drivers/staging/wilc1000/linux_wlan.o

Patch add following things to file :

(quoted diff) +0 -4
-init_irq declaration
-At preprocessor (!defined WILC_SDIO) to defination of init_irq
-At preprocessor (!defined WILC_SDIO) to defination isr_uh_routine
-removes unnecessary lines to declare *wilc

Patch fixes 702c0e50f and 2c1d05d10 tags.

---

(quoted diff) +0 -2
-Fixes tag added suggested by Dan carpenter.
-Remove declaration of autovariable with same type and same name suggested by Joe Perches
 
  drivers/staging/wilc1000/linux_wlan.c | 10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)
drivers/staging/wilc1000/linux_wlan.c +6 -4
index 086f1db..5bd14ed 100644
@@ -208,7 +208,7 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event
  	return NOTIFY_DONE;
  }
 
-#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO)
+#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO) || (!defined WILC_SDIO)
  static irqreturn_t isr_uh_routine(int irq, void *user_data)
  {
  	perInterface_wlan_t *nic;
@@ -246,7 +246,7 @@ irqreturn_t isr_bh_routine(int irq, void *userdata)
  	return IRQ_HANDLED;
  }
 
-#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO)
+#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO) || (!defined WILC_SDIO)
  static int init_irq(struct net_device *dev)
  {
  	int ret = 0;
@@ -937,6 +937,10 @@ static void wlan_deinitialize_threads(struct net_device *dev)
  	}
  }
 
+#if (!defined WILC_SDIO) || (defined WILC_SDIO_IRQ_GPIO)
+static int init_irq(struct net_device *dev);
+#endif
+
  int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t *p_nic)
  {
  	wilc_wlan_inp_t nwi;
@@ -1578,9 +1582,7 @@ int wilc_netdev_init(struct wilc **wilc)
 
  static int __init init_wilc_driver(void)
  {
-#ifdef WILC_SPI
  	struct wilc *wilc;
-#endif
 
  #if defined(WILC_DEBUGFS)
  	if (wilc_debugfs_init() < 0) {
Signature · 6 lines
2.6.2

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
#3 lore raw

Hi Punit Vara,

I cannot find build errors on my build machines.

According the log which you have posted before says *wilc is undeclared in the function init_wilc_driver, which means WILC_SPI is selected because one of SPI or SDIO should be chosen at the moment. Hence, struct wilc *wilc should be compiled together.
It looks like wilc1000 is compiled without SPI or SDIO.

Of course, there are many cases that I don't know, so you could let me know the wilc1000 build configuration?

static int __init init_wilc_driver(void)
{

#ifdef WILC_SPI
	struct wilc *wilc;

#endif

..

#ifdef WILC_SDIO
	{
		int ret;

		ret = sdio_register_driver(&wilc_bus);
		if (ret < 0)
			PRINT_D(INIT_DBG, "init_wilc_driver: Failed register sdio driver\n");

		return ret;
	}
#else
	PRINT_D(INIT_DBG, "Initializing netdev\n");
	if (wilc_netdev_init(&wilc))
		PRINT_ER("Couldn't initialize netdev\n");
	return 0;

#endif

regards,
glen lee.

Quoted 97 lines · glen lee

I just check the email, I will get back here after I check the patches related with this issue.

regards,
glen lee.

Quoted 85 lines · Dan Carpenter

Top posting beucase I am a bad person. Punit, you should have CC'd Glen since this is his code.

The fix is still not right. It will cause an unused variable warning on some configs.

To be honest, this code makes no sense. Why do we even have the wilc variable in this function when we never use it? Just declare move it to wilc_netdev_init(). Also there are too many ifdefs in this code.

regards,
dan carpenter

Quoted 71 lines · Punit Vara

This patch is to the linux_wlan.c file that fixes up break found during make drivers/staging/wilc1000/linux_wlan.o

Patch add following things to file :

(quoted diff) +0 -4
-init_irq declaration
-At preprocessor (!defined WILC_SDIO) to defination of init_irq
-At preprocessor (!defined WILC_SDIO) to defination isr_uh_routine
-removes unnecessary lines to declare *wilc

Patch fixes 702c0e50f and 2c1d05d10 tags.

---

(quoted diff) +0 -2
-Fixes tag added suggested by Dan carpenter.
-Remove declaration of autovariable with same type and same name 

suggested by Joe Perches

  drivers/staging/wilc1000/linux_wlan.c | 10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)
drivers/staging/wilc1000/linux_wlan.c +0 -0
index 086f1db..5bd14ed 100644
@@ -208,7 +208,7 @@ static int dev_state_ev_handler(struct 

notifier_block *this, unsigned long event

      return NOTIFY_DONE;

}
-#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO)
+#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO) || (!defined WILC_SDIO)
static irqreturn_t isr_uh_routine(int irq, void *user_data)

  {
      perInterface_wlan_t *nic;
drivers/staging/wilc1000/linux_wlan.c +4 -2
@@ -246,7 +246,7 @@ irqreturn_t isr_bh_routine(int irq, void *userdata)
      return IRQ_HANDLED;
  }
  -#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO)
+#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO) || (!defined 
 WILC_SDIO)
  static int init_irq(struct net_device *dev)
  {
      int ret = 0;
@@ -937,6 +937,10 @@ static void wlan_deinitialize_threads(struct 
 net_device *dev)
      }
  }
  +#if (!defined WILC_SDIO) || (defined WILC_SDIO_IRQ_GPIO)
+static int init_irq(struct net_device *dev);
+#endif
+
  int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t 
 *p_nic)
  {
      wilc_wlan_inp_t nwi;
@@ -1578,9 +1582,7 @@ int wilc_netdev_init(struct wilc **wilc)
    static int __init init_wilc_driver(void)
  {
-#ifdef WILC_SPI
      struct wilc *wilc;
-#endif
    #if defined(WILC_DEBUGFS)
      if (wilc_debugfs_init() < 0) {
Signature · 6 lines
2.6.2

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel 
Signature · 3 lines
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#4 lore raw
Quoted 9 lines · glen lee

Hi Punit Vara,

I cannot find build errors on my build machines.

According the log which you have posted before says *wilc is undeclared in the function init_wilc_driver, which means WILC_SPI is selected because one of SPI or SDIO should be chosen at the moment. Hence, struct wilc *wilc should be compiled together.
It looks like wilc1000 is compiled without SPI or SDIO.

Quoted 5 lines

Of course, there are many cases that I don't know, so you could let me know the wilc1000 build configuration?

static int __init init_wilc_driver(void)
{
#ifdef WILC_SPI

This should be #ifndef WILC_SDIO

Quoted 2 lines
	struct wilc *wilc;

#endif

But the large question remains of why do we have this variable here any way?

regards,
dan carpenter

author
#5 lore raw
Quoted 19 lines · Dan Carpenter
Quoted 9 lines · glen lee

Hi Punit Vara,

I cannot find build errors on my build machines.

According the log which you have posted before says *wilc is undeclared in the function init_wilc_driver, which means WILC_SPI is selected because one of SPI or SDIO should be chosen at the moment. Hence, struct wilc *wilc should be compiled together.
It looks like wilc1000 is compiled without SPI or SDIO.

Quoted 5 lines

Of course, there are many cases that I don't know, so you could let me know the wilc1000 build configuration?

static int __init init_wilc_driver(void)
{
#ifdef WILC_SPI

This should be #ifndef WILC_SDIO

Quoted 9 lines
Quoted 2 lines
      struct wilc *wilc;

#endif

But the large question remains of why do we have this variable here any way?

regards,
dan carpenter

I do not know why it is there .that is why I did not touch it first my proposed patch was like
#if (defined WILC_SPI) || (!defined WILC_SDIO)
struct wilc *wilc;
#endif

#6 lore raw
In reply to Dan Carpenter
Quoted 10 lines · Dan Carpenter
Quoted 9 lines · glen lee

Hi Punit Vara,

I cannot find build errors on my build machines.

According the log which you have posted before says *wilc is undeclared in the function init_wilc_driver, which means WILC_SPI is selected because one of SPI or SDIO should be chosen at the moment. Hence, struct wilc *wilc should be compiled together.
It looks like wilc1000 is compiled without SPI or SDIO.

Quoted 6 lines
Quoted 5 lines

Of course, there are many cases that I don't know, so you could let me know the wilc1000 build configuration?

static int __init init_wilc_driver(void)
{
#ifdef WILC_SPI

This should be #ifndef WILC_SDIO

I will do this in the next patch series.

Quoted 5 lines
Quoted 3 lines
	struct wilc *wilc;

#endif

But the large question remains of why do we have this variable here any way?

As you pointed out, the variable is do-nothing for spi driver for now.
After reworking SPI driver, the wilc will be passed to SPI as spi drive data like we already did in SDIO.

We have done this to remove extern variable g_linux_wlan which is primary structure of wilc1000. For now it is not used, but need it not to break the build.

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);
	if (!wl_sdio)
		return -ENOMEM;

	PRINT_D(INIT_DBG, "Initializing netdev\n");
	local_sdio_func = func;
	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);

regards,
glen lee.

Quoted 4 lines

regards,
dan carpenter

author
#7 lore raw
Quoted 66 lines · glen lee
Quoted 14 lines · Dan Carpenter
Quoted 12 lines · glen lee

Hi Punit Vara,

I cannot find build errors on my build machines.

According the log which you have posted before says *wilc is undeclared in the function init_wilc_driver,
which means WILC_SPI is selected because one of SPI or SDIO should be chosen at the moment.
Hence, struct wilc *wilc should be compiled together.
It looks like wilc1000 is compiled without SPI or SDIO.

Quoted 8 lines
Quoted 6 lines

Of course, there are many cases that I don't know, so you could let me know the wilc1000 build configuration?

static int __init init_wilc_driver(void)
{
#ifdef WILC_SPI

This should be #ifndef WILC_SDIO

I will do this in the next patch series.

Quoted 6 lines
Quoted 3 lines
        struct wilc *wilc;

#endif

But the large question remains of why do we have this variable here any way?

As you pointed out, the variable is do-nothing for spi driver for now. After reworking SPI driver, the wilc will be passed to SPI as spi drive data like we already did in SDIO.

We have done this to remove extern variable g_linux_wlan which is primary structure of wilc1000.
For now it is not used, but need it not to break the build.

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);
        if (!wl_sdio)
                return -ENOMEM;

        PRINT_D(INIT_DBG, "Initializing netdev\n");
        local_sdio_func = func;
        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);
Quoted 8 lines

regards,
glen lee.

Quoted 4 lines

regards,
dan carpenter

How about this patch @Dan and @glen ,For me it does not create any build error. For #ifndef WILC_SDIO that pointer *wilc is not compiling so that creates the error.

drivers/staging/wilc1000/linux_wlan.c +0 -0
@@ -224,7 +224,7 @@ static int dev_state_ev_handler(struct

notifier_block *this, unsigned long event

}

-#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO)
+#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO) || (!defined WIC_SDIO)
 static irqreturn_t isr_uh_routine(int irq, void *user_data)
 {
        perInterface_wlan_t *nic;
@@ -264,7 +264,7 @@ irqreturn_t isr_bh_routine(int irq, void *userdata)
        return IRQ_HANDLED;

}

-#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO)
+#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO) || (!defined WILC_SDIO)
 static int init_irq(struct net_device *dev)
 {
        int ret = 0;
@@ -1083,6 +1083,10 @@ static void wlan_deinitialize_threads(struct
net_device *dev)
        }

}

+#if (!defined WILC_SDIO) || (defined WILC_SDIO_IRQ_GPIO) +static int init_irq(struct net_device *dev);
+#endif
+
int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t *p_nic)

 {
        wilc_wlan_inp_t nwi;

@@ -1791,7 +1795,7 @@ int wilc_netdev_init(struct wilc **wilc)
/*The 1st function called after module inserted*/ static int __init init_wilc_driver(void)
{
-#ifdef WILC_SPI
+#if (defined WILC_SPI) || (!defined WILC_SDIO)

        struct wilc *wilc;

#endif

#8 lore raw
Quoted 62 lines · punit vara
Quoted 61 lines · glen lee
Quoted 12 lines · Dan Carpenter
Quoted 11 lines · glen lee

Hi Punit Vara,

I cannot find build errors on my build machines.

According the log which you have posted before says *wilc is undeclared in the function init_wilc_driver,
which means WILC_SPI is selected because one of SPI or SDIO should be chosen at the moment.
Hence, struct wilc *wilc should be compiled together.
It looks like wilc1000 is compiled without SPI or SDIO.

Quoted 7 lines
Quoted 6 lines

Of course, there are many cases that I don't know, so you could let me know the wilc1000 build configuration?

static int __init init_wilc_driver(void)
{
#ifdef WILC_SPI

This should be #ifndef WILC_SDIO

I will do this in the next patch series.

Quoted 4 lines
Quoted 2 lines
         struct wilc *wilc;

#endif

But the large question remains of why do we have this variable here any way?

As you pointed out, the variable is do-nothing for spi driver for now. After reworking SPI driver, the wilc will be passed to SPI as spi drive data like we already did in SDIO.

We have done this to remove extern variable g_linux_wlan which is primary structure of wilc1000.
For now it is not used, but need it not to break the build.

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);
         if (!wl_sdio)
                 return -ENOMEM;

         PRINT_D(INIT_DBG, "Initializing netdev\n");
         local_sdio_func = func;
         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);

regards,
glen lee.

Quoted 6 lines
Quoted 3 lines
Quoted 3 lines

regards,
dan carpenter

How about this patch @Dan and @glen ,For me it does not create any build error. For #ifndef WILC_SDIO that pointer *wilc is not compiling so that creates the error.

As Dan said, I also think there are too many ifdefs now. We will remove the defines after reworking SPI/SDIO modules.

For now, I cannot test since build error does not happens in my side. :(

Just in case, will this works for you?
config WILC1000_DRIVER

	bool "WILC1000 support (WiFi only)"
	depends on CFG80211 && WEXT_CORE && INET

+ depends on MMC || SPI

I will look into more about this later.

regards,
glen lee.

Quoted 42 lines
drivers/staging/wilc1000/linux_wlan.c +0 -0
@@ -224,7 +224,7 @@ static int dev_state_ev_handler(struct

notifier_block *this, unsigned long event

  }
drivers/staging/wilc1000/linux_wlan.c +6 -2
-#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO)
+#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO) || (!defined WIC_SDIO)
  static irqreturn_t isr_uh_routine(int irq, void *user_data)
  {
         perInterface_wlan_t *nic;
@@ -264,7 +264,7 @@ irqreturn_t isr_bh_routine(int irq, void *userdata)
         return IRQ_HANDLED;
  }
 
-#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO)
+#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO) || (!defined WILC_SDIO)
  static int init_irq(struct net_device *dev)
  {
         int ret = 0;
@@ -1083,6 +1083,10 @@ static void wlan_deinitialize_threads(struct
 net_device *dev)
         }
  }
 
+#if (!defined WILC_SDIO) || (defined WILC_SDIO_IRQ_GPIO)
+static int init_irq(struct net_device *dev);
+#endif
+
  int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t *p_nic)
  {
         wilc_wlan_inp_t nwi;
drivers/staging/wilc1000/linux_wlan.c +1 -1
@@ -1791,7 +1795,7 @@ int wilc_netdev_init(struct wilc **wilc)
  /*The 1st function called after module inserted*/
  static int __init init_wilc_driver(void)
  {
-#ifdef WILC_SPI
+#if (defined WILC_SPI) || (!defined WILC_SDIO)
         struct wilc *wilc;
  #endif
author
#9 lore raw
Quoted 129 lines · glen lee
Quoted 71 lines · punit vara
Quoted 69 lines · glen lee
Quoted 14 lines · Dan Carpenter
Quoted 12 lines · glen lee

Hi Punit Vara,

I cannot find build errors on my build machines.

According the log which you have posted before says *wilc is undeclared in the function init_wilc_driver,
which means WILC_SPI is selected because one of SPI or SDIO should be chosen at the moment.
Hence, struct wilc *wilc should be compiled together.
It looks like wilc1000 is compiled without SPI or SDIO.

Quoted 8 lines
Quoted 6 lines

Of course, there are many cases that I don't know, so you could let me know the wilc1000 build configuration?

static int __init init_wilc_driver(void)
{
#ifdef WILC_SPI

This should be #ifndef WILC_SDIO

I will do this in the next patch series.

Quoted 5 lines
Quoted 2 lines
         struct wilc *wilc;

#endif

But the large question remains of why do we have this variable here any way?

As you pointed out, the variable is do-nothing for spi driver for now. After reworking SPI driver, the wilc will be passed to SPI as spi drive data
like we already did in SDIO.

We have done this to remove extern variable g_linux_wlan which is primary structure of wilc1000.
For now it is not used, but need it not to break the build.

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);
         if (!wl_sdio)
                 return -ENOMEM;

         PRINT_D(INIT_DBG, "Initializing netdev\n");
         local_sdio_func = func;
         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);

regards,
glen lee.

Quoted 6 lines
Quoted 3 lines
Quoted 3 lines

regards,
dan carpenter

How about this patch @Dan and @glen ,For me it does not create any build error. For #ifndef WILC_SDIO that pointer *wilc is not compiling so that creates the error.

As Dan said, I also think there are too many ifdefs now. We will remove the defines after
reworking SPI/SDIO modules.

For now, I cannot test since build error does not happens in my side. :(

Just in case, will this works for you?
config WILC1000_DRIVER
bool "WILC1000 support (WiFi only)"
depends on CFG80211 && WEXT_CORE && INET
+ depends on MMC || SPI

I will look into more about this later.

regards,
glen lee.

Quoted 29 lines
drivers/staging/wilc1000/linux_wlan.c +0 -0
@@ -224,7 +224,7 @@ static int dev_state_ev_handler(struct

notifier_block *this, unsigned long event

  }
drivers/staging/wilc1000/linux_wlan.c +1 -1
-#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO)
+#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO) || (!defined

WIC_SDIO)
static irqreturn_t isr_uh_routine(int irq, void *user_data)

  {
         perInterface_wlan_t *nic;
drivers/staging/wilc1000/linux_wlan.c +1 -1
@@ -264,7 +264,7 @@ irqreturn_t isr_bh_routine(int irq, void *userdata)
         return IRQ_HANDLED;
  }
 
-#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO)
+#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO) || (!defined
 WILC_SDIO)
  static int init_irq(struct net_device *dev)
  {
         int ret = 0;
drivers/staging/wilc1000/linux_wlan.c +0 -0
@@ -1083,6 +1083,10 @@ static void wlan_deinitialize_threads(struct
 net_device *dev)
         }
  }
 
Quoted 18 lines
Quoted 9 lines
drivers/staging/wilc1000/linux_wlan.c +4 -0
+#if (!defined WILC_SDIO) || (defined WILC_SDIO_IRQ_GPIO)
+static int init_irq(struct net_device *dev);
+#endif
+
  int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t
 *p_nic)
  {
         wilc_wlan_inp_t nwi;

drivers/staging/wilc1000/linux_wlan.c int wilc_netdev_init(struct wilc **wilc) · line 1800

Quoted 7 lines
drivers/staging/wilc1000/linux_wlan.c +1 -1
@@ -1791,7 +1795,7 @@ int wilc_netdev_init(struct wilc **wilc)
  /*The 1st function called after module inserted*/
  static int __init init_wilc_driver(void)
  {
-#ifdef WILC_SPI
+#if (defined WILC_SPI) || (!defined WILC_SDIO)
         struct wilc *wilc;
  #endif

If I don't do any changes as I did . and add line in Kconfig as you told me

make ./drivers/staging/wilc1000/ this working fine for me

but

make ./drivers/staging/wilc1000/linux_wlan.o is creates error. Yes there are two many ifdef I also agreed with Dan.

You can fetch latest changes from staging . you can create that build error . Untill then I will follow whatever Dan say :-)

#10 lore raw
Quoted 9 lines · punit vara
Quoted 8 lines · glen lee
Quoted 5 lines · punit vara
Quoted 3 lines · glen lee
Quoted 1 line · Dan Carpenter
Quoted 8 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines · glen lee
Quoted 1 line

make ./drivers/staging/wilc1000/ this working fine for me

but

make ./drivers/staging/wilc1000/linux_wlan.o is creates error.

I am also not getting build failure. Can you please post your .config file.

regards
sudip

author
#11 lore raw
Quoted 15 lines · Sudip Mukherjee
Quoted 14 lines · punit vara
Quoted 10 lines · glen lee
Quoted 7 lines · punit vara
Quoted 5 lines · glen lee
Quoted 3 lines · Dan Carpenter
Quoted 1 line · glen lee

make ./drivers/staging/wilc1000/ this working fine for me

Quoted 8 lines
Quoted 3 lines

but

make ./drivers/staging/wilc1000/linux_wlan.o is creates error.

I am also not getting build failure. Can you please post your .config file.

regards
sudip

Can you tell me Sudip where .config file is saved ? Sorry for asking silly question :-(

#12 lore raw
Quoted 19 lines · punit vara
Quoted 17 lines · Sudip Mukherjee
Quoted 16 lines · punit vara
Quoted 10 lines · glen lee
Quoted 7 lines · punit vara
Quoted 5 lines · glen lee
Quoted 3 lines · Dan Carpenter
Quoted 1 line · glen lee

make ./drivers/staging/wilc1000/ this working fine for me

but

Quoted 8 lines
Quoted 6 lines
Quoted 1 line

make ./drivers/staging/wilc1000/linux_wlan.o is creates error.

I am also not getting build failure. Can you please post your .config file.

regards
sudip

Can you tell me Sudip where .config file is saved ? Sorry for asking silly question :-(

at the root of your linux tree. the kernel will be compiled based on the options in these file.

regards
sudip

author
#13 lore raw
In reply to Sudip Mukherjee
Quoted 15 lines · Sudip Mukherjee
Quoted 14 lines · punit vara
Quoted 10 lines · glen lee
Quoted 7 lines · punit vara
Quoted 5 lines · glen lee
Quoted 3 lines · Dan Carpenter
Quoted 1 line · glen lee

make ./drivers/staging/wilc1000/ this working fine for me

Quoted 8 lines
Quoted 3 lines

but

make ./drivers/staging/wilc1000/linux_wlan.o is creates error.

I am also not getting build failure. Can you please post your .config file.

regards
sudip

I have attached .config file . and please tell me should I focus on this patch or not . Because build is still broken.For temporary this patch can be useful to fix the build .Later on as per requirement Glen can change the code .

#14 lore raw
Quoted 21 lines · punit vara
Quoted 19 lines · Sudip Mukherjee
Quoted 17 lines · punit vara
Quoted 10 lines · glen lee
Quoted 7 lines · punit vara
Quoted 5 lines · glen lee
Quoted 3 lines · Dan Carpenter
Quoted 1 line · glen lee

make ./drivers/staging/wilc1000/ this working fine for me

but

make ./drivers/staging/wilc1000/linux_wlan.o is creates error.

Quoted 8 lines
Quoted 4 lines

I am also not getting build failure. Can you please post your .config file.

regards
sudip

I have attached .config file . and please tell me should I focus on this patch or not . Because build is still broken.For temporary this patch can be useful to fix the build .Later on as per requirement Glen can change the code .

With your config file also I am not getting any build failure. Can you please tell what are the exact compilation steps you are following?

Here are my steps after I have copied your config file as .config.
1) make oldconfig && make prepare
2) make bzImage && make modules

And I dont see any build failure.
I think you are not building bzImage and the modules before testing wilc compilation. And that is why it is unable to find SPI or SDIO.

regards
sudip

author
#15 lore raw
Quoted 38 lines · Sudip Mukherjee
Quoted 21 lines · punit vara
Quoted 19 lines · Sudip Mukherjee
Quoted 17 lines · punit vara
Quoted 10 lines · glen lee
Quoted 7 lines · punit vara
Quoted 5 lines · glen lee
Quoted 3 lines · Dan Carpenter
Quoted 1 line · glen lee

make ./drivers/staging/wilc1000/ this working fine for me

but

make ./drivers/staging/wilc1000/linux_wlan.o is creates error.

Quoted 8 lines
Quoted 4 lines

I am also not getting build failure. Can you please post your .config file.

regards
sudip

I have attached .config file . and please tell me should I focus on this patch or not . Because build is still broken.For temporary this patch can be useful to fix the build .Later on as per requirement Glen can change the code .

With your config file also I am not getting any build failure. Can you please tell what are the exact compilation steps you are following?

Here are my steps after I have copied your config file as .config.
1) make oldconfig && make prepare
2) make bzImage && make modules

Quoted 6 lines

And I dont see any build failure.
I think you are not building bzImage and the modules before testing wilc compilation. And that is why it is unable to find SPI or SDIO.

regards
sudip

Steps I have followed:
1. I have updated staging tree and checkout to new branch.
2. make drivers/staging/wilc1000/linux_wlan.o

When I have performed second step it automatically ask me about different modules options "yes/no" I have pressed ENTER in every option .At last configuration are written to .config. and module start building and I have found error at last. I will try to perform 2 step you have suggested .