Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b6cfa87 authored by Ajay Singh's avatar Ajay Singh Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: rename variable from 'gpio' to 'gpio_irq' 



Rename from 'gpio' to 'gpio_irq', so its inlcude the information about
the purpose of GPIO.

Signed-off-by: default avatarAjay Singh <ajay.kathat@microchip.com>
Reviewed-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 847794a1

drivers/staging/wilc1000/linux_wlan.c

+9 −8
Original line number Diff line number Diff line
@@ -127,9 +127,9 @@ static int init_irq(struct net_device *dev) 
	struct wilc_vif *vif = netdev_priv(dev);

	struct wilc *wl = vif->wilc;



	if ((gpio_request(wl->gpio, "WILC_INTR") == 0) &&

	    (gpio_direction_input(wl->gpio) == 0)) {

		wl->dev_irq_num = gpio_to_irq(wl->gpio);

	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 {

		ret = -1;

		netdev_err(dev, "could not obtain gpio for WILC_INTR\n");
@@ -140,13 +140,14 @@ static int init_irq(struct net_device *dev) 
					      isr_bh_routine,

					      IRQF_TRIGGER_LOW | IRQF_ONESHOT,

					      "WILC_IRQ", dev) < 0) {

		netdev_err(dev, "Failed to request IRQ GPIO: %d\n", wl->gpio);

		gpio_free(wl->gpio);

		netdev_err(dev, "Failed to request IRQ GPIO: %d\n",

			   wl->gpio_irq);

		gpio_free(wl->gpio_irq);

		ret = -1;

	} else {

		netdev_dbg(dev,

			   "IRQ request succeeded IRQ-NUM= %d on GPIO: %d\n",

			   wl->dev_irq_num, wl->gpio);

			   wl->dev_irq_num, wl->gpio_irq);

	}



	return ret;
@@ -160,7 +161,7 @@ static void deinit_irq(struct net_device *dev) 
	/* Deinitialize IRQ */

	if (wilc->dev_irq_num) {

		free_irq(wilc->dev_irq_num, wilc);

		gpio_free(wilc->gpio);

		gpio_free(wilc->gpio_irq);

	}

}
@@ -651,7 +652,7 @@ static int wilc_wlan_initialize(struct net_device *dev, struct wilc_vif *vif) 
			goto fail_locks;

		}



		if (wl->gpio >= 0 && init_irq(dev)) {

		if (wl->gpio_irq >= 0 && init_irq(dev)) {

			ret = -EIO;

			goto fail_locks;

		}

drivers/staging/wilc1000/wilc_sdio.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static int linux_sdio_probe(struct sdio_func *func, 
	}

	sdio_set_drvdata(func, wilc);

	wilc->dev = &func->dev;

	wilc->gpio = gpio;

	wilc->gpio_irq = gpio;



	dev_info(&func->dev, "Driver Initializing success\n");

	return 0;

drivers/staging/wilc1000/wilc_spi.c

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static int wilc_bus_probe(struct spi_device *spi) 


	spi_set_drvdata(spi, wilc);

	wilc->dev = &spi->dev;

	wilc->gpio = gpio;

	wilc->gpio_irq = gpio;



	return 0;

}

drivers/staging/wilc1000/wilc_wfi_netdevice.h

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ struct wilc { 
	const struct wilc_hif_func *hif_func;

	int io_type;

	int mac_status;

	int gpio;

	int gpio_irq;

	bool initialized;

	int dev_irq_num;

	int close;