Commit 3ccdcd51 authored by Gabor Juhos's avatar Gabor Juhos Committed by John W. Linville

rt2x00: rt2800pci: move rt2800mmio_enable_radio function to another module

Move the function into the rt2800mmio module, in order
to make it usable from other modules.
Signed-off-by: default avatarGabor Juhos <juhosg@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1e7d3035
...@@ -852,6 +852,21 @@ int rt2800mmio_init_registers(struct rt2x00_dev *rt2x00dev) ...@@ -852,6 +852,21 @@ int rt2800mmio_init_registers(struct rt2x00_dev *rt2x00dev)
} }
EXPORT_SYMBOL_GPL(rt2800mmio_init_registers); EXPORT_SYMBOL_GPL(rt2800mmio_init_registers);
/*
* Device state switch handlers.
*/
int rt2800mmio_enable_radio(struct rt2x00_dev *rt2x00dev)
{
/* Wait for DMA, ignore error until we initialize queues. */
rt2800_wait_wpdma_ready(rt2x00dev);
if (unlikely(rt2800mmio_init_queues(rt2x00dev)))
return -EIO;
return rt2800_enable_radio(rt2x00dev);
}
EXPORT_SYMBOL_GPL(rt2800mmio_enable_radio);
MODULE_AUTHOR(DRV_PROJECT); MODULE_AUTHOR(DRV_PROJECT);
MODULE_VERSION(DRV_VERSION); MODULE_VERSION(DRV_VERSION);
MODULE_DESCRIPTION("rt2800 MMIO library"); MODULE_DESCRIPTION("rt2800 MMIO library");
......
...@@ -159,4 +159,7 @@ void rt2800mmio_clear_entry(struct queue_entry *entry); ...@@ -159,4 +159,7 @@ void rt2800mmio_clear_entry(struct queue_entry *entry);
int rt2800mmio_init_queues(struct rt2x00_dev *rt2x00dev); int rt2800mmio_init_queues(struct rt2x00_dev *rt2x00dev);
int rt2800mmio_init_registers(struct rt2x00_dev *rt2x00dev); int rt2800mmio_init_registers(struct rt2x00_dev *rt2x00dev);
/* Device state switch handlers. */
int rt2800mmio_enable_radio(struct rt2x00_dev *rt2x00dev);
#endif /* RT2800MMIO_H */ #endif /* RT2800MMIO_H */
...@@ -205,23 +205,10 @@ static int rt2800pci_write_firmware(struct rt2x00_dev *rt2x00dev, ...@@ -205,23 +205,10 @@ static int rt2800pci_write_firmware(struct rt2x00_dev *rt2x00dev,
return 0; return 0;
} }
#endif /* CONFIG_PCI */
/* /*
* Device state switch handlers. * Device state switch handlers.
*/ */
static int rt2800mmio_enable_radio(struct rt2x00_dev *rt2x00dev)
{
/* Wait for DMA, ignore error until we initialize queues. */
rt2800_wait_wpdma_ready(rt2x00dev);
if (unlikely(rt2800mmio_init_queues(rt2x00dev)))
return -EIO;
return rt2800_enable_radio(rt2x00dev);
}
#ifdef CONFIG_PCI
static int rt2800pci_enable_radio(struct rt2x00_dev *rt2x00dev) static int rt2800pci_enable_radio(struct rt2x00_dev *rt2x00dev)
{ {
int retval; int retval;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment