staging: wilc1000: use 'interrupt' for handling IRQ

Modified code to handle IRQ using 'interrupt' property.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>

Author: ajaykathat

drivers/staging/wilc1000/netdev.c

@@ -167,88 +167,35 @@ static irqreturn_t isr_bh_routine(int irq, void *userdata)
 
 static int init_irq(struct net_device *dev)
 {
-	int ret = 0;
 	struct wilc_vif *vif = netdev_priv(dev);
 	struct wilc *wl = vif->wilc;
 
-#if KERNEL_VERSION(3, 13, 0) < LINUX_VERSION_CODE
-
-	wl->gpio_irq = gpiod_get(wl->dt_dev, "irq", GPIOD_IN);
-	if (IS_ERR(wl->gpio_irq)) {
-		dev_warn(wl->dev, "failed to get IRQ GPIO, load default\r\n");
-		wl->gpio_irq = gpio_to_desc(GPIO_NUM);
-		if (!wl->gpio_irq) {
-			dev_warn(wl->dev, "failed to load default irq\r\n");
-			return -EINVAL;
-		}
-	} else {
-		dev_info(wl->dev, "got gpio_irq successfully\r\n");
-	}
-
-	ret = gpiod_direction_input(wl->gpio_irq);
-	if (ret) {
-		PRINT_ER(dev, "could not obtain gpio for WILC_INTR\n");
-		return -EINVAL;
-	}
-
-	wl->dev_irq_num = gpiod_to_irq(wl->gpio_irq);
-	if (wl->dev_irq_num < 0) {
-		PRINT_ER(dev, "could not the IRQ\n");
-		goto free_gpio;
-	}
-#else
-	wl->gpio_irq = of_get_named_gpio_flags(wl->dt_dev->of_node,
-					       "irq-gpios", 0, NULL);
-	if (wl->gpio_irq < 0) {
-		wl->gpio_irq = GPIO_NUM;
-		dev_warn(wl->dev, "failed to get IRQ GPIO, load default\r\n");
-	}
-
-	if ((gpio_request(wl->gpio_irq, "WILC_INTR") == 0) &&
-	    (gpio_direction_input(wl->gpio_irq) == 0)) {
-		wl->dev_irq_num = gpio_to_irq(wl->gpio_irq);
-	} else {
-		dev_err(wl->dev, "could not obtain gpio for WILC_INTR\n");
-		wl->gpio_irq = 0;
-		return -EINVAL;
-	}
-
-#endif
-
 	if (wl->io_type == WILC_HIF_SPI ||
 		wl->io_type == WILC_HIF_SDIO_GPIO_IRQ) {
 		if (request_threaded_irq(wl->dev_irq_num, isr_uh_routine,
 					 isr_bh_routine, IRQF_TRIGGER_FALLING |
 							IRQF_ONESHOT |
 							IRQF_NO_SUSPEND,
 					 "WILC_IRQ", wl) < 0) {
-			PRINT_ER(dev, "Failed to request IRQ\n");
-			goto free_gpio;
+			PRINT_ER(dev, "Failed to request IRQ [%d]\n",
+				 wl->dev_irq_num);
+			return -EINVAL;
 		}
 	} else {
 		if (request_irq(wl->dev_irq_num, host_wakeup_isr,
 					     IRQF_TRIGGER_FALLING |
 					     IRQF_NO_SUSPEND,
 					     "WILC_IRQ", wl) < 0) {
-			PRINT_ER(dev, "Failed to request IRQ\n");
-			goto free_gpio;
+			PRINT_ER(dev, "Failed to request IRQ [%d]\n",
+				 wl->dev_irq_num);
+			return -EINVAL;
 		}
 	}
 
 	PRINT_INFO(dev, GENERIC_DBG, "IRQ request succeeded IRQ-NUM= %d\n",
 		   wl->dev_irq_num);
 	enable_irq_wake(wl->dev_irq_num);
 	return 0;
-
-free_gpio:
-#if KERNEL_VERSION(3, 13, 0) < LINUX_VERSION_CODE
-	gpiod_put(wl->gpio_irq);
-	wl->gpio_irq = NULL;
-#else
-	gpio_free(wl->gpio_irq);
-	wl->gpio_irq = 0;
-#endif
-	return -EINVAL;
 }
 
 static void deinit_irq(struct net_device *dev)
@@ -257,24 +204,8 @@ static void deinit_irq(struct net_device *dev)
 	struct wilc *wilc = vif->wilc;
 
 	/* Deinitialize IRQ */
-	if (wilc->dev_irq_num > 0) {
+	if (wilc->dev_irq_num)
 		free_irq(wilc->dev_irq_num, wilc);
-		wilc->dev_irq_num = -1;
-	}
-
-#if KERNEL_VERSION(3, 13, 0) < LINUX_VERSION_CODE
-	if (wilc->gpio_irq) {
-		gpiod_put(wilc->gpio_irq);
-		wilc->gpio_irq = NULL;
-	}
-#else
-	if (wilc->gpio_irq > 0) {
-		gpio_free(wilc->gpio_irq);
-		wilc->gpio_irq = 0;
-	}
-
-#endif
-
 }
 
 void wilc_mac_indicate(struct wilc *wilc)

drivers/staging/wilc1000/netdev.h

@@ -377,11 +377,6 @@ struct wilc {
 	const struct wilc_hif_func *hif_func;
 	int io_type;
 	s8 mac_status;
-#if KERNEL_VERSION(3, 13, 0) < LINUX_VERSION_CODE
-	struct gpio_desc *gpio_irq;
-#else
-	int gpio_irq;
-#endif
 	struct clk *rtc_clk;
 	bool initialized;
 	int dev_irq_num;

drivers/staging/wilc1000/sdio.c

@@ -11,6 +11,7 @@
 #include <linux/module.h>
 #include <linux/pm_runtime.h>
 #include <linux/mmc/sdio.h>
+#include <linux/of_irq.h>
 
 #include "netdev.h"
 #include "wlan.h"
@@ -148,6 +149,7 @@ static int wilc_sdio_probe(struct sdio_func *func,
 	int ret, io_type;
 	static bool init_power;
 	struct wilc_sdio *sdio_priv;
+	int irq_num;
 
 	sdio_priv = kzalloc(sizeof(*sdio_priv), GFP_KERNEL);
 	if (!sdio_priv)
@@ -170,7 +172,11 @@ static int wilc_sdio_probe(struct sdio_func *func,
 	wilc->dt_dev = &func->card->dev;
 	sdio_priv->wl = wilc;
 
-	wilc->rtc_clk = devm_clk_get(&func->card->dev, "rtc_clk");
+	irq_num = of_irq_get(func->card->dev.of_node, 0);
+	if (irq_num > 0)
+		wilc->dev_irq_num = irq_num;
+
+	wilc->rtc_clk = devm_clk_get(&func->card->dev, "rtc");
 	if (PTR_ERR_OR_ZERO(wilc->rtc_clk) == -EPROBE_DEFER)
 		return -EPROBE_DEFER;
 	else if (!IS_ERR(wilc->rtc_clk))

drivers/staging/wilc1000/spi.c

@@ -134,8 +134,9 @@ static int wilc_bus_probe(struct spi_device *spi)
 	wilc->dev = &spi->dev;
 	wilc->bus_data = spi_priv;
 	wilc->dt_dev = &spi->dev;
+	wilc->dev_irq_num = spi->irq;
 
-	wilc->rtc_clk = devm_clk_get(&spi->dev, "rtc_clk");
+	wilc->rtc_clk = devm_clk_get(&spi->dev, "rtc");
 	if (PTR_ERR_OR_ZERO(wilc->rtc_clk) == -EPROBE_DEFER)
 		return -EPROBE_DEFER;
 	else if (!IS_ERR(wilc->rtc_clk))

drivers/staging/wilc1000/wlan.h

@@ -241,7 +241,6 @@ static inline bool is_wilc3000(u32 id)
 #define WILC_TX_BUFF_SIZE	(64 * 1024)
 
 #define MODALIAS		"WILC_SPI"
-#define GPIO_NUM		0x5B
 #define GPIO_NUM_CHIP_EN	94
 #define GPIO_NUM_RESET		60