Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1264814

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

Show all headers | View raw

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 :
-struct wilc *wilc declaration
-init_irq declaration
-At preprocessor (!defined WILC_SDIO) to defination of init_irq
-At preprocessor (!defined WILC_SDIO) to defination isr_uh_routine

Signed-off-by: Punit Vara <punitvara@gmail.com>
---
 drivers/staging/wilc1000/linux_wlan.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index 09ddba2..0a21e62 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -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 WILC_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;
@@ -1082,6 +1082,9 @@ static void wlan_deinitialize_threads(struct net_device *dev)
 		wl->txq_thread = NULL;
 	}
 }
+
+#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)
 {
@@ -1791,6 +1794,7 @@ int wilc_netdev_init(struct wilc **wilc)
 /*The 1st function called after module inserted*/
 static int __init init_wilc_driver(void)
 {
+	struct wilc *wilc;
 #ifdef WILC_SPI
 	struct wilc *wilc;
 #endif
-- 
2.6.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] Staging: wilc1000: Fix build break due to undeclared *wilc and implicit declaration of init_irq Punit Vara <punitvara@gmail.com> - 2015-11-07 12:40 +0100
  Re: [PATCH] Staging: wilc1000: Fix build break due to undeclared  *wilc and implicit declaration of init_irq Dan Carpenter <dan.carpenter@oracle.com> - 2015-11-07 15:00 +0100
    Re: [PATCH] Staging: wilc1000: Fix build break due to undeclared  *wilc and implicit declaration of init_irq punit vara <punitvara@gmail.com> - 2015-11-07 19:20 +0100
      Re: [PATCH] Staging: wilc1000: Fix build break due to undeclared  *wilc and implicit declaration of init_irq Dan Carpenter <dan.carpenter@oracle.com> - 2015-11-07 22:00 +0100
        Re: [PATCH] Staging: wilc1000: Fix build break due to undeclared  *wilc and implicit declaration of init_irq punit vara <punitvara@gmail.com> - 2015-11-08 15:00 +0100
        Re: [PATCH] Staging: wilc1000: Fix build break due to undeclared  *wilc and implicit declaration of init_irq punit vara <punitvara@gmail.com> - 2015-11-08 16:20 +0100

csiph-web