Skip to content

Commit

Permalink
wifi: wl1251: drop support for platform data
Browse files Browse the repository at this point in the history
Remove support for configuring the device via platform data because
there are no users of wl1251_platform_data left in the mainline kernel.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20221109224250.2885119-2-dmitry.torokhov@gmail.com
  • Loading branch information
Dmitry Torokhov authored and Kalle Valo committed Nov 16, 2022
1 parent e14e4c9 commit 06463f6
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 108 deletions.
1 change: 0 additions & 1 deletion MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -20665,7 +20665,6 @@ W: https://wireless.wiki.kernel.org/en/users/Drivers/wl12xx
W: https://wireless.wiki.kernel.org/en/users/Drivers/wl1251
T: git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git
F: drivers/net/wireless/ti/
F: include/linux/wl12xx.h

TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
M: John Stultz <jstultz@google.com>
Expand Down
8 changes: 0 additions & 8 deletions drivers/net/wireless/ti/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,4 @@ source "drivers/net/wireless/ti/wl18xx/Kconfig"
# keep last for automatic dependencies
source "drivers/net/wireless/ti/wlcore/Kconfig"

config WILINK_PLATFORM_DATA
bool "TI WiLink platform data"
depends on WLCORE_SDIO || WL1251_SDIO
default y
help
Small platform data bit needed to pass data to the sdio modules.


endif # WLAN_VENDOR_TI
35 changes: 0 additions & 35 deletions drivers/net/wireless/ti/wilink_platform_data.c

This file was deleted.

8 changes: 1 addition & 7 deletions drivers/net/wireless/ti/wl1251/sdio.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include <linux/mmc/sdio_func.h>
#include <linux/mmc/sdio_ids.h>
#include <linux/platform_device.h>
#include <linux/wl12xx.h>
#include <linux/irq.h>
#include <linux/pm_runtime.h>
#include <linux/of.h>
Expand Down Expand Up @@ -197,7 +196,6 @@ static int wl1251_sdio_probe(struct sdio_func *func,
struct wl1251 *wl;
struct ieee80211_hw *hw;
struct wl1251_sdio *wl_sdio;
const struct wl1251_platform_data *wl1251_board_data;
struct device_node *np = func->dev.of_node;

hw = wl1251_alloc_hw();
Expand Down Expand Up @@ -225,11 +223,7 @@ static int wl1251_sdio_probe(struct sdio_func *func,
wl->if_priv = wl_sdio;
wl->if_ops = &wl1251_sdio_ops;

wl1251_board_data = wl1251_get_platform_data();
if (!IS_ERR(wl1251_board_data)) {
wl->irq = wl1251_board_data->irq;
wl->use_eeprom = wl1251_board_data->use_eeprom;
} else if (np) {
if (np) {
wl->use_eeprom = of_property_read_bool(np, "ti,wl1251-has-eeprom");
wl->irq = of_irq_get(np, 0);
if (wl->irq == -EPROBE_DEFER) {
Expand Down
15 changes: 3 additions & 12 deletions drivers/net/wireless/ti/wl1251/spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include <linux/swab.h>
#include <linux/crc7.h>
#include <linux/spi/spi.h>
#include <linux/wl12xx.h>
#include <linux/gpio.h>
#include <linux/of.h>
#include <linux/of_gpio.h>
Expand Down Expand Up @@ -226,16 +225,13 @@ static const struct wl1251_if_operations wl1251_spi_ops = {

static int wl1251_spi_probe(struct spi_device *spi)
{
struct wl1251_platform_data *pdata = dev_get_platdata(&spi->dev);
struct device_node *np = spi->dev.of_node;
struct ieee80211_hw *hw;
struct wl1251 *wl;
int ret;

if (!np && !pdata) {
wl1251_error("no platform data");
if (!np)
return -ENODEV;
}

hw = wl1251_alloc_hw();
if (IS_ERR(hw))
Expand All @@ -259,14 +255,9 @@ static int wl1251_spi_probe(struct spi_device *spi)
goto out_free;
}

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);
} else if (pdata) {
wl->power_gpio = pdata->power_gpio;
wl->use_eeprom = pdata->use_eeprom;
}
wl->use_eeprom = of_property_read_bool(np, "ti,wl1251-has-eeprom");

wl->power_gpio = of_get_named_gpio(np, "ti,power-gpio", 0);
if (wl->power_gpio == -EPROBE_DEFER) {
ret = -EPROBE_DEFER;
goto out_free;
Expand Down
1 change: 0 additions & 1 deletion drivers/net/wireless/ti/wlcore/spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include <linux/swab.h>
#include <linux/crc7.h>
#include <linux/spi/spi.h>
#include <linux/wl12xx.h>
#include <linux/platform_device.h>
#include <linux/of_irq.h>
#include <linux/regulator/consumer.h>
Expand Down
44 changes: 0 additions & 44 deletions include/linux/wl12xx.h

This file was deleted.

0 comments on commit 06463f6

Please sign in to comment.