OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rt2x00: rt2800pci: use separate firmware callbacks for SoC devices 

Use empty firmware callbacks for SoC devices because those
don't require firmware.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Gabor Juhos 2013-10-17 09:42:28 +02:00 committed by John W. Linville
parent 68597ea867
commit 899a5f493a
1 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/net/wireless/rt2x00/rt2800pci.c
View File

@ -164,7 +164,6 @@ static inline int rt2800pci_read_eeprom_efuse(struct rt2x00_dev *rt2x00dev)
{ {
return rt2800_read_eeprom_efuse(rt2x00dev); return rt2800_read_eeprom_efuse(rt2x00dev);
} }
#endif /* CONFIG_PCI */
/* /*
* Firmware functions * Firmware functions
@ -206,6 +205,7 @@ static int rt2800pci_write_firmware(struct rt2x00_dev *rt2x00dev,
return 0; return 0;
} }
#endif /* CONFIG_PCI */
/* /*
* Device state switch handlers. * Device state switch handlers.
@ -493,6 +493,34 @@ static int rt2800soc_read_eeprom(struct rt2x00_dev *rt2x00dev)
return 0; return 0;
} }
/* Firmware functions */
static char *rt2800soc_get_firmware_name(struct rt2x00_dev *rt2x00dev)
{
WARN_ON_ONCE(1);
return NULL;
}
static int rt2800soc_load_firmware(struct rt2x00_dev *rt2x00dev,
const u8 *data, const size_t len)
{
WARN_ON_ONCE(1);
return 0;
}
static int rt2800soc_check_firmware(struct rt2x00_dev *rt2x00dev,
const u8 *data, const size_t len)
{
WARN_ON_ONCE(1);
return 0;
}
static int rt2800soc_write_firmware(struct rt2x00_dev *rt2x00dev,
const u8 *data, const size_t len)
{
WARN_ON_ONCE(1);
return 0;
}
static const struct ieee80211_ops rt2800soc_mac80211_ops = { static const struct ieee80211_ops rt2800soc_mac80211_ops = {
.tx = rt2x00mac_tx, .tx = rt2x00mac_tx,
.start = rt2x00mac_start, .start = rt2x00mac_start,
@ -530,7 +558,7 @@ static const struct rt2800_ops rt2800soc_rt2800_ops = {
.regbusy_read = rt2x00mmio_regbusy_read, .regbusy_read = rt2x00mmio_regbusy_read,
.read_eeprom = rt2800soc_read_eeprom, .read_eeprom = rt2800soc_read_eeprom,
.hwcrypt_disabled = rt2800pci_hwcrypt_disabled, .hwcrypt_disabled = rt2800pci_hwcrypt_disabled,
.drv_write_firmware = rt2800pci_write_firmware, .drv_write_firmware = rt2800soc_write_firmware,
.drv_init_registers = rt2800mmio_init_registers, .drv_init_registers = rt2800mmio_init_registers,
.drv_get_txwi = rt2800mmio_get_txwi, .drv_get_txwi = rt2800mmio_get_txwi,
}; };
@ -543,9 +571,9 @@ static const struct rt2x00lib_ops rt2800soc_rt2x00_ops = {
.rxdone_tasklet = rt2800mmio_rxdone_tasklet, .rxdone_tasklet = rt2800mmio_rxdone_tasklet,
.autowake_tasklet = rt2800mmio_autowake_tasklet, .autowake_tasklet = rt2800mmio_autowake_tasklet,
.probe_hw = rt2800_probe_hw, .probe_hw = rt2800_probe_hw,
.get_firmware_name = rt2800pci_get_firmware_name, .get_firmware_name = rt2800soc_get_firmware_name,
.check_firmware = rt2800_check_firmware, .check_firmware = rt2800soc_check_firmware,
.load_firmware = rt2800_load_firmware, .load_firmware = rt2800soc_load_firmware,
.initialize = rt2x00mmio_initialize, .initialize = rt2x00mmio_initialize,
.uninitialize = rt2x00mmio_uninitialize, .uninitialize = rt2x00mmio_uninitialize,
.get_entry_state = rt2800mmio_get_entry_state, .get_entry_state = rt2800mmio_get_entry_state,