Commit 346bdd8e authored by H. Nikolaus Schaller's avatar H. Nikolaus Schaller Committed by Kalle Valo
Browse files

wl1251: remove ti,power-gpio for SDIO mode 



Remove handling of this property from code.

Note that wl->power_gpio is still needed in
the header file for SPI mode (N900).

Suggested by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarH. Nikolaus Schaller <hns@goldelico.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 57f0a29c

drivers/net/wireless/ti/wl1251/sdio.c

+2 −30
Original line number Diff line number Diff line
@@ -15,9 +15,7 @@ 
#include <linux/wl12xx.h>

#include <linux/irq.h>

#include <linux/pm_runtime.h>

#include <linux/gpio.h>

#include <linux/of.h>

#include <linux/of_gpio.h>

#include <linux/of_irq.h>



#include "wl1251.h"
@@ -160,15 +158,6 @@ static int wl1251_sdio_set_power(struct wl1251 *wl, bool enable) 
	int ret;



	if (enable) {

		/*

		 * Power is controlled by runtime PM, but we still call board

		 * callback in case it wants to do any additional setup,

		 * for example enabling clock buffer for the module.

		 */

		if (gpio_is_valid(wl->power_gpio))

			gpio_set_value(wl->power_gpio, true);





		ret = pm_runtime_get_sync(&func->dev);

		if (ret < 0) {

			pm_runtime_put_sync(&func->dev);
@@ -186,9 +175,6 @@ static int wl1251_sdio_set_power(struct wl1251 *wl, bool enable) 
		ret = pm_runtime_put_sync(&func->dev);

		if (ret < 0)

			goto out;



		if (gpio_is_valid(wl->power_gpio))

			gpio_set_value(wl->power_gpio, false);

	}



out:
@@ -241,31 +227,17 @@ static int wl1251_sdio_probe(struct sdio_func *func, 


	wl1251_board_data = wl1251_get_platform_data();

	if (!IS_ERR(wl1251_board_data)) {

		wl->power_gpio = wl1251_board_data->power_gpio;

		wl->irq = wl1251_board_data->irq;

		wl->use_eeprom = wl1251_board_data->use_eeprom;

	} else if (np) {

		wl->use_eeprom = of_property_read_bool(np,

						       "ti,wl1251-has-eeprom");

		wl->power_gpio = of_get_named_gpio(np, "ti,power-gpio", 0);

		wl->use_eeprom = of_property_read_bool(np, "ti,wl1251-has-eeprom");

		wl->irq = of_irq_get(np, 0);



		if (wl->power_gpio == -EPROBE_DEFER ||

		    wl->irq == -EPROBE_DEFER) {

		if (wl->irq == -EPROBE_DEFER) {

			ret = -EPROBE_DEFER;

			goto disable;

		}

	}



	if (gpio_is_valid(wl->power_gpio)) {

		ret = devm_gpio_request(&func->dev, wl->power_gpio,

								"wl1251 power");

		if (ret) {

			wl1251_error("Failed to request gpio: %d\n", ret);

			goto disable;

		}

	}



	if (wl->irq) {

		irq_set_status_flags(wl->irq, IRQ_NOAUTOEN);

		ret = request_irq(wl->irq, wl1251_line_irq, 0, "wl1251", wl);

CRA Git | Maintained and supported by SUSTech CRA and CCSE