Skip to content

L
linux
Commit b5cfde3f authored by Gabor Juhos's avatar Gabor Juhos Committed by John W. Linville
Browse files
Options

rt2x00: rt2800pci: use rt2800mmio prefix for interrupt functions 

The functions are used for devices with memory
mapped I/O and contain no PCI specific code at
all. Use rt2800mmio prefix instead of rt2800pci
in the function names to reflect that.

The patch contains no functional changes.
Signed-off-by: default avatarGabor Juhos <juhosg@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9732497d
Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 36 deletions
drivers/net/wireless/rt2x00/rt2800pci.c
View file @ b5cfde3f
...@@ -448,7 +448,7 @@ static int rt2800pci_init_queues(struct rt2x00_dev *rt2x00dev) ...@@ -448,7 +448,7 @@ static int rt2800pci_init_queues(struct rt2x00_dev *rt2x00dev)
/* /*
* Device state switch handlers. * Device state switch handlers.
*/ */
static void rt2800pci_toggle_irq(struct rt2x00_dev *rt2x00dev, static void rt2800mmio_toggle_irq(struct rt2x00_dev *rt2x00dev,
enum dev_state state) enum dev_state state)
{ {
u32 reg; u32 reg;
...@@ -607,7 +607,7 @@ static int rt2800pci_set_device_state(struct rt2x00_dev *rt2x00dev, ...@@ -607,7 +607,7 @@ static int rt2800pci_set_device_state(struct rt2x00_dev *rt2x00dev,
break; break;
case STATE_RADIO_IRQ_ON: case STATE_RADIO_IRQ_ON:
case STATE_RADIO_IRQ_OFF: case STATE_RADIO_IRQ_OFF:
rt2800pci_toggle_irq(rt2x00dev, state); rt2800mmio_toggle_irq(rt2x00dev, state);
break; break;
case STATE_DEEP_SLEEP: case STATE_DEEP_SLEEP:
case STATE_SLEEP: case STATE_SLEEP:
...@@ -630,7 +630,7 @@ static int rt2800pci_set_device_state(struct rt2x00_dev *rt2x00dev, ...@@ -630,7 +630,7 @@ static int rt2800pci_set_device_state(struct rt2x00_dev *rt2x00dev,
/* /*
* Interrupt functions. * Interrupt functions.
*/ */
static void rt2800pci_wakeup(struct rt2x00_dev *rt2x00dev) static void rt2800mmio_wakeup(struct rt2x00_dev *rt2x00dev)
{ {
struct ieee80211_conf conf = { .flags = 0 }; struct ieee80211_conf conf = { .flags = 0 };
struct rt2x00lib_conf libconf = { .conf = &conf }; struct rt2x00lib_conf libconf = { .conf = &conf };
...@@ -638,7 +638,7 @@ static void rt2800pci_wakeup(struct rt2x00_dev *rt2x00dev) ...@@ -638,7 +638,7 @@ static void rt2800pci_wakeup(struct rt2x00_dev *rt2x00dev)
rt2800_config(rt2x00dev, &libconf, IEEE80211_CONF_CHANGE_PS); rt2800_config(rt2x00dev, &libconf, IEEE80211_CONF_CHANGE_PS);
} }
static bool rt2800pci_txdone_entry_check(struct queue_entry *entry, u32 status) static bool rt2800mmio_txdone_entry_check(struct queue_entry *entry, u32 status)
{ {
__le32 *txwi; __le32 *txwi;
u32 word; u32 word;
...@@ -653,7 +653,7 @@ static bool rt2800pci_txdone_entry_check(struct queue_entry *entry, u32 status) ...@@ -653,7 +653,7 @@ static bool rt2800pci_txdone_entry_check(struct queue_entry *entry, u32 status)
return (tx_wcid == wcid); return (tx_wcid == wcid);
} }
static bool rt2800pci_txdone_find_entry(struct queue_entry *entry, void *data) static bool rt2800mmio_txdone_find_entry(struct queue_entry *entry, void *data)
{ {
u32 status = *(u32 *)data; u32 status = *(u32 *)data;
...@@ -670,7 +670,7 @@ static bool rt2800pci_txdone_find_entry(struct queue_entry *entry, void *data) ...@@ -670,7 +670,7 @@ static bool rt2800pci_txdone_find_entry(struct queue_entry *entry, void *data)
* To mitigate this effect, associate the tx status to the first frame * To mitigate this effect, associate the tx status to the first frame
* in the tx queue with a matching wcid. * in the tx queue with a matching wcid.
*/ */
if (rt2800pci_txdone_entry_check(entry, status) && if (rt2800mmio_txdone_entry_check(entry, status) &&
!test_bit(ENTRY_DATA_STATUS_SET, &entry->flags)) { !test_bit(ENTRY_DATA_STATUS_SET, &entry->flags)) {
/* /*
* Got a matching frame, associate the tx status with * Got a matching frame, associate the tx status with
...@@ -685,7 +685,7 @@ static bool rt2800pci_txdone_find_entry(struct queue_entry *entry, void *data) ...@@ -685,7 +685,7 @@ static bool rt2800pci_txdone_find_entry(struct queue_entry *entry, void *data)
return false; return false;
} }
static bool rt2800pci_txdone_match_first(struct queue_entry *entry, void *data) static bool rt2800mmio_txdone_match_first(struct queue_entry *entry, void *data)
{ {
u32 status = *(u32 *)data; u32 status = *(u32 *)data;
...@@ -706,7 +706,7 @@ static bool rt2800pci_txdone_match_first(struct queue_entry *entry, void *data) ...@@ -706,7 +706,7 @@ static bool rt2800pci_txdone_match_first(struct queue_entry *entry, void *data)
/* Check the next frame */ /* Check the next frame */
return false; return false;
} }
static bool rt2800pci_txdone_release_entries(struct queue_entry *entry, static bool rt2800mmio_txdone_release_entries(struct queue_entry *entry,
void *data) void *data)
{ {
if (test_bit(ENTRY_DATA_STATUS_SET, &entry->flags)) { if (test_bit(ENTRY_DATA_STATUS_SET, &entry->flags)) {
...@@ -719,7 +719,7 @@ static bool rt2800pci_txdone_release_entries(struct queue_entry *entry, ...@@ -719,7 +719,7 @@ static bool rt2800pci_txdone_release_entries(struct queue_entry *entry,
return true; return true;
} }
static bool rt2800pci_txdone(struct rt2x00_dev *rt2x00dev) static bool rt2800mmio_txdone(struct rt2x00_dev *rt2x00dev)
{ {
struct data_queue *queue; struct data_queue *queue;
u32 status; u32 status;
...@@ -765,14 +765,14 @@ static bool rt2800pci_txdone(struct rt2x00_dev *rt2x00dev) ...@@ -765,14 +765,14 @@ static bool rt2800pci_txdone(struct rt2x00_dev *rt2x00dev)
*/ */
if (!rt2x00queue_for_each_entry(queue, Q_INDEX_DONE, if (!rt2x00queue_for_each_entry(queue, Q_INDEX_DONE,
Q_INDEX, &status, Q_INDEX, &status,
rt2800pci_txdone_find_entry)) { rt2800mmio_txdone_find_entry)) {
/* /*
* We cannot match the tx status to any frame, so just * We cannot match the tx status to any frame, so just
* use the first one. * use the first one.
*/ */
if (!rt2x00queue_for_each_entry(queue, Q_INDEX_DONE, if (!rt2x00queue_for_each_entry(queue, Q_INDEX_DONE,
Q_INDEX, &status, Q_INDEX, &status,
rt2800pci_txdone_match_first)) { rt2800mmio_txdone_match_first)) {
rt2x00_warn(rt2x00dev, "No frame found for TX status on queue %u, dropping\n", rt2x00_warn(rt2x00dev, "No frame found for TX status on queue %u, dropping\n",
qid); qid);
break; break;
...@@ -784,7 +784,7 @@ static bool rt2800pci_txdone(struct rt2x00_dev *rt2x00dev) ...@@ -784,7 +784,7 @@ static bool rt2800pci_txdone(struct rt2x00_dev *rt2x00dev)
*/ */
rt2x00queue_for_each_entry(queue, Q_INDEX_DONE, rt2x00queue_for_each_entry(queue, Q_INDEX_DONE,
Q_INDEX, NULL, Q_INDEX, NULL,
rt2800pci_txdone_release_entries); rt2800mmio_txdone_release_entries);
if (--max_tx_done == 0) if (--max_tx_done == 0)
break; break;
...@@ -793,7 +793,7 @@ static bool rt2800pci_txdone(struct rt2x00_dev *rt2x00dev) ...@@ -793,7 +793,7 @@ static bool rt2800pci_txdone(struct rt2x00_dev *rt2x00dev)
return !max_tx_done; return !max_tx_done;
} }
static inline void rt2800pci_enable_interrupt(struct rt2x00_dev *rt2x00dev, static inline void rt2800mmio_enable_interrupt(struct rt2x00_dev *rt2x00dev,
struct rt2x00_field32 irq_field) struct rt2x00_field32 irq_field)
{ {
u32 reg; u32 reg;
...@@ -809,10 +809,10 @@ static inline void rt2800pci_enable_interrupt(struct rt2x00_dev *rt2x00dev, ...@@ -809,10 +809,10 @@ static inline void rt2800pci_enable_interrupt(struct rt2x00_dev *rt2x00dev,
spin_unlock_irq(&rt2x00dev->irqmask_lock); spin_unlock_irq(&rt2x00dev->irqmask_lock);
} }
static void rt2800pci_txstatus_tasklet(unsigned long data) static void rt2800mmio_txstatus_tasklet(unsigned long data)
{ {
struct rt2x00_dev *rt2x00dev = (struct rt2x00_dev *)data; struct rt2x00_dev *rt2x00dev = (struct rt2x00_dev *)data;
if (rt2800pci_txdone(rt2x00dev)) if (rt2800mmio_txdone(rt2x00dev))
tasklet_schedule(&rt2x00dev->txstatus_tasklet); tasklet_schedule(&rt2x00dev->txstatus_tasklet);
/* /*
...@@ -822,15 +822,15 @@ static void rt2800pci_txstatus_tasklet(unsigned long data) ...@@ -822,15 +822,15 @@ static void rt2800pci_txstatus_tasklet(unsigned long data)
*/ */
} }
static void rt2800pci_pretbtt_tasklet(unsigned long data) static void rt2800mmio_pretbtt_tasklet(unsigned long data)
{ {
struct rt2x00_dev *rt2x00dev = (struct rt2x00_dev *)data; struct rt2x00_dev *rt2x00dev = (struct rt2x00_dev *)data;
rt2x00lib_pretbtt(rt2x00dev); rt2x00lib_pretbtt(rt2x00dev);
if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags)) if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
rt2800pci_enable_interrupt(rt2x00dev, INT_MASK_CSR_PRE_TBTT); rt2800mmio_enable_interrupt(rt2x00dev, INT_MASK_CSR_PRE_TBTT);
} }
static void rt2800pci_tbtt_tasklet(unsigned long data) static void rt2800mmio_tbtt_tasklet(unsigned long data)
{ {
struct rt2x00_dev *rt2x00dev = (struct rt2x00_dev *)data; struct rt2x00_dev *rt2x00dev = (struct rt2x00_dev *)data;
struct rt2800_drv_data *drv_data = rt2x00dev->drv_data; struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
...@@ -861,27 +861,28 @@ static void rt2800pci_tbtt_tasklet(unsigned long data) ...@@ -861,27 +861,28 @@ static void rt2800pci_tbtt_tasklet(unsigned long data)
} }
if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags)) if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
rt2800pci_enable_interrupt(rt2x00dev, INT_MASK_CSR_TBTT); rt2800mmio_enable_interrupt(rt2x00dev, INT_MASK_CSR_TBTT);
} }
static void rt2800pci_rxdone_tasklet(unsigned long data) static void rt2800mmio_rxdone_tasklet(unsigned long data)
{ {
struct rt2x00_dev *rt2x00dev = (struct rt2x00_dev *)data; struct rt2x00_dev *rt2x00dev = (struct rt2x00_dev *)data;
if (rt2x00mmio_rxdone(rt2x00dev)) if (rt2x00mmio_rxdone(rt2x00dev))
tasklet_schedule(&rt2x00dev->rxdone_tasklet); tasklet_schedule(&rt2x00dev->rxdone_tasklet);
else if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags)) else if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
rt2800pci_enable_interrupt(rt2x00dev, INT_MASK_CSR_RX_DONE); rt2800mmio_enable_interrupt(rt2x00dev, INT_MASK_CSR_RX_DONE);
} }
static void rt2800pci_autowake_tasklet(unsigned long data) static void rt2800mmio_autowake_tasklet(unsigned long data)
{ {
struct rt2x00_dev *rt2x00dev = (struct rt2x00_dev *)data; struct rt2x00_dev *rt2x00dev = (struct rt2x00_dev *)data;
rt2800pci_wakeup(rt2x00dev); rt2800mmio_wakeup(rt2x00dev);
if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags)) if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
rt2800pci_enable_interrupt(rt2x00dev, INT_MASK_CSR_AUTO_WAKEUP); rt2800mmio_enable_interrupt(rt2x00dev,
INT_MASK_CSR_AUTO_WAKEUP);
} }
static void rt2800pci_txstatus_interrupt(struct rt2x00_dev *rt2x00dev) static void rt2800mmio_txstatus_interrupt(struct rt2x00_dev *rt2x00dev)
{ {
u32 status; u32 status;
int i; int i;
...@@ -920,7 +921,7 @@ static void rt2800pci_txstatus_interrupt(struct rt2x00_dev *rt2x00dev) ...@@ -920,7 +921,7 @@ static void rt2800pci_txstatus_interrupt(struct rt2x00_dev *rt2x00dev)
tasklet_schedule(&rt2x00dev->txstatus_tasklet); tasklet_schedule(&rt2x00dev->txstatus_tasklet);
} }
static irqreturn_t rt2800pci_interrupt(int irq, void *dev_instance) static irqreturn_t rt2800mmio_interrupt(int irq, void *dev_instance)
{ {
struct rt2x00_dev *rt2x00dev = dev_instance; struct rt2x00_dev *rt2x00dev = dev_instance;
u32 reg, mask; u32 reg, mask;
...@@ -943,7 +944,7 @@ static irqreturn_t rt2800pci_interrupt(int irq, void *dev_instance) ...@@ -943,7 +944,7 @@ static irqreturn_t rt2800pci_interrupt(int irq, void *dev_instance)
mask = ~reg; mask = ~reg;
if (rt2x00_get_field32(reg, INT_SOURCE_CSR_TX_FIFO_STATUS)) { if (rt2x00_get_field32(reg, INT_SOURCE_CSR_TX_FIFO_STATUS)) {
rt2800pci_txstatus_interrupt(rt2x00dev); rt2800mmio_txstatus_interrupt(rt2x00dev);
/* /*
* Never disable the TX_FIFO_STATUS interrupt. * Never disable the TX_FIFO_STATUS interrupt.
*/ */
...@@ -1035,12 +1036,12 @@ static const struct rt2800_ops rt2800pci_rt2800_ops = { ...@@ -1035,12 +1036,12 @@ static const struct rt2800_ops rt2800pci_rt2800_ops = {
}; };
static const struct rt2x00lib_ops rt2800pci_rt2x00_ops = { static const struct rt2x00lib_ops rt2800pci_rt2x00_ops = {
.irq_handler = rt2800pci_interrupt, .irq_handler = rt2800mmio_interrupt,
.txstatus_tasklet = rt2800pci_txstatus_tasklet, .txstatus_tasklet = rt2800mmio_txstatus_tasklet,
.pretbtt_tasklet = rt2800pci_pretbtt_tasklet, .pretbtt_tasklet = rt2800mmio_pretbtt_tasklet,
.tbtt_tasklet = rt2800pci_tbtt_tasklet, .tbtt_tasklet = rt2800mmio_tbtt_tasklet,
.rxdone_tasklet = rt2800pci_rxdone_tasklet, .rxdone_tasklet = rt2800mmio_rxdone_tasklet,
.autowake_tasklet = rt2800pci_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 = rt2800pci_get_firmware_name,
.check_firmware = rt2800_check_firmware, .check_firmware = rt2800_check_firmware,
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7