diff options
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2800pci.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c index d0e4ec50caec..7770471bb443 100644 --- a/drivers/net/wireless/rt2x00/rt2800pci.c +++ b/drivers/net/wireless/rt2x00/rt2800pci.c | |||
| @@ -245,7 +245,7 @@ static int rt2800pci_write_firmware(struct rt2x00_dev *rt2x00dev, | |||
| 245 | /* | 245 | /* |
| 246 | * Initialization functions. | 246 | * Initialization functions. |
| 247 | */ | 247 | */ |
| 248 | static bool rt2800pci_get_entry_state(struct queue_entry *entry) | 248 | static bool rt2800mmio_get_entry_state(struct queue_entry *entry) |
| 249 | { | 249 | { |
| 250 | struct queue_entry_priv_mmio *entry_priv = entry->priv_data; | 250 | struct queue_entry_priv_mmio *entry_priv = entry->priv_data; |
| 251 | u32 word; | 251 | u32 word; |
| @@ -261,7 +261,7 @@ static bool rt2800pci_get_entry_state(struct queue_entry *entry) | |||
| 261 | } | 261 | } |
| 262 | } | 262 | } |
| 263 | 263 | ||
| 264 | static void rt2800pci_clear_entry(struct queue_entry *entry) | 264 | static void rt2800mmio_clear_entry(struct queue_entry *entry) |
| 265 | { | 265 | { |
| 266 | struct queue_entry_priv_mmio *entry_priv = entry->priv_data; | 266 | struct queue_entry_priv_mmio *entry_priv = entry->priv_data; |
| 267 | struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb); | 267 | struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb); |
| @@ -290,7 +290,7 @@ static void rt2800pci_clear_entry(struct queue_entry *entry) | |||
| 290 | } | 290 | } |
| 291 | } | 291 | } |
| 292 | 292 | ||
| 293 | static int rt2800pci_init_queues(struct rt2x00_dev *rt2x00dev) | 293 | static int rt2800mmio_init_queues(struct rt2x00_dev *rt2x00dev) |
| 294 | { | 294 | { |
| 295 | struct queue_entry_priv_mmio *entry_priv; | 295 | struct queue_entry_priv_mmio *entry_priv; |
| 296 | 296 | ||
| @@ -358,7 +358,7 @@ static int rt2800pci_init_queues(struct rt2x00_dev *rt2x00dev) | |||
| 358 | /* | 358 | /* |
| 359 | * Device state switch handlers. | 359 | * Device state switch handlers. |
| 360 | */ | 360 | */ |
| 361 | static int rt2800pci_init_registers(struct rt2x00_dev *rt2x00dev) | 361 | static int rt2800mmio_init_registers(struct rt2x00_dev *rt2x00dev) |
| 362 | { | 362 | { |
| 363 | u32 reg; | 363 | u32 reg; |
| 364 | 364 | ||
| @@ -411,7 +411,7 @@ static int rt2800pci_enable_radio(struct rt2x00_dev *rt2x00dev) | |||
| 411 | /* Wait for DMA, ignore error until we initialize queues. */ | 411 | /* Wait for DMA, ignore error until we initialize queues. */ |
| 412 | rt2800_wait_wpdma_ready(rt2x00dev); | 412 | rt2800_wait_wpdma_ready(rt2x00dev); |
| 413 | 413 | ||
| 414 | if (unlikely(rt2800pci_init_queues(rt2x00dev))) | 414 | if (unlikely(rt2800mmio_init_queues(rt2x00dev))) |
| 415 | return -EIO; | 415 | return -EIO; |
| 416 | 416 | ||
| 417 | retval = rt2800_enable_radio(rt2x00dev); | 417 | retval = rt2800_enable_radio(rt2x00dev); |
| @@ -553,7 +553,7 @@ static const struct rt2800_ops rt2800pci_rt2800_ops = { | |||
| 553 | .read_eeprom = rt2800pci_read_eeprom, | 553 | .read_eeprom = rt2800pci_read_eeprom, |
| 554 | .hwcrypt_disabled = rt2800pci_hwcrypt_disabled, | 554 | .hwcrypt_disabled = rt2800pci_hwcrypt_disabled, |
| 555 | .drv_write_firmware = rt2800pci_write_firmware, | 555 | .drv_write_firmware = rt2800pci_write_firmware, |
| 556 | .drv_init_registers = rt2800pci_init_registers, | 556 | .drv_init_registers = rt2800mmio_init_registers, |
| 557 | .drv_get_txwi = rt2800mmio_get_txwi, | 557 | .drv_get_txwi = rt2800mmio_get_txwi, |
| 558 | }; | 558 | }; |
| 559 | 559 | ||
| @@ -570,8 +570,8 @@ static const struct rt2x00lib_ops rt2800pci_rt2x00_ops = { | |||
| 570 | .load_firmware = rt2800_load_firmware, | 570 | .load_firmware = rt2800_load_firmware, |
| 571 | .initialize = rt2x00mmio_initialize, | 571 | .initialize = rt2x00mmio_initialize, |
| 572 | .uninitialize = rt2x00mmio_uninitialize, | 572 | .uninitialize = rt2x00mmio_uninitialize, |
| 573 | .get_entry_state = rt2800pci_get_entry_state, | 573 | .get_entry_state = rt2800mmio_get_entry_state, |
| 574 | .clear_entry = rt2800pci_clear_entry, | 574 | .clear_entry = rt2800mmio_clear_entry, |
| 575 | .set_device_state = rt2800pci_set_device_state, | 575 | .set_device_state = rt2800pci_set_device_state, |
| 576 | .rfkill_poll = rt2800_rfkill_poll, | 576 | .rfkill_poll = rt2800_rfkill_poll, |
| 577 | .link_stats = rt2800_link_stats, | 577 | .link_stats = rt2800_link_stats, |
