Skip to content

Commit

Permalink
rt2x00: rt2800pci: move rt2800mmio_enable_radio function to another m…
Browse files Browse the repository at this point in the history
…odule

Move the function into the rt2800mmio module, in order
to make it usable from other modules.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Gabor Juhos authored and John W. Linville committed Oct 18, 2013
1 parent 1e7d303 commit 3ccdcd5
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 13 deletions.
15 changes: 15 additions & 0 deletions drivers/net/wireless/rt2x00/rt2800mmio.c
Original file line number Diff line number Diff line change
Expand Up @@ -852,6 +852,21 @@ int rt2800mmio_init_registers(struct rt2x00_dev *rt2x00dev)
}
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_VERSION(DRV_VERSION);
MODULE_DESCRIPTION("rt2800 MMIO library");
Expand Down
3 changes: 3 additions & 0 deletions drivers/net/wireless/rt2x00/rt2800mmio.h
Original file line number Diff line number Diff line change
Expand Up @@ -159,4 +159,7 @@ void rt2800mmio_clear_entry(struct queue_entry *entry);
int rt2800mmio_init_queues(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 */
13 changes: 0 additions & 13 deletions drivers/net/wireless/rt2x00/rt2800pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -205,23 +205,10 @@ static int rt2800pci_write_firmware(struct rt2x00_dev *rt2x00dev,

return 0;
}
#endif /* CONFIG_PCI */

/*
* 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)
{
int retval;
Expand Down

0 comments on commit 3ccdcd5

Please sign in to comment.