Re: [PATCH V2] Staging: wilc1000: Fix build break due to undeclared *wilc and implicit declaration of init_irq

[glen lee <glen.lee@atmel.com>]

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.


On 2015년 11월 09일 11:03, glen lee wrote:
> I just check the email, I will get back here after I check the patches 
> related with this issue.
>
> regards,
> glen lee.
>
>
> On 2015년 11월 09일 06:59, Dan Carpenter wrote:
>> 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
>>
>> On Mon, Nov 09, 2015 at 03:01:50AM +0530, Punit Vara wrote:
>>> 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.
>>>
>>> Signed-off-by: Punit Vara <punitvara@gmail.com>
>>> ---
>>> -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(-)
>>>
>>> diff --git a/drivers/staging/wilc1000/linux_wlan.c 
>>> b/drivers/staging/wilc1000/linux_wlan.c
>>> index 086f1db..5bd14ed 100644
>>> --- a/drivers/staging/wilc1000/linux_wlan.c
>>> +++ b/drivers/staging/wilc1000/linux_wlan.c
>>> @@ -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) {
>>> -- 
>>> 2.6.2
>>>
>>> _______________________________________________
>>> devel mailing list
>>> devel@linuxdriverproject.org
>>> http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel 
>>>
>
> -- 
> To unsubscribe from this list: send the line "unsubscribe 
> linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html