diff options
author | Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com> | 2014-09-10 09:34:49 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-09-11 15:27:39 -0400 |
commit | e4dbb093de182bb515821105dcdb8f2268bf6ffc (patch) | |
tree | 8b680db2a61444613f561732f47474d4445e468b | |
parent | d00a6367d227199de52b37622c984af8a21a2507 (diff) |
wil6210: rename [en|dis]able irq to [un]mask
To better reflect real action performed, rename:
s/wil6210_disable_irq/wil_mask_irq/
s/wil6210_enable_irq/wil_unmask_irq/
Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/ath/wil6210/interrupt.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/ath/wil6210/main.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/ath/wil6210/wil6210.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/ath/wil6210/interrupt.c b/drivers/net/wireless/ath/wil6210/interrupt.c index 7d319d92e3a2..d265e7c67503 100644 --- a/drivers/net/wireless/ath/wil6210/interrupt.c +++ b/drivers/net/wireless/ath/wil6210/interrupt.c | |||
@@ -135,7 +135,7 @@ static void wil6210_unmask_irq_pseudo(struct wil6210_priv *wil) | |||
135 | HOSTADDR(RGF_DMA_PSEUDO_CAUSE_MASK_SW)); | 135 | HOSTADDR(RGF_DMA_PSEUDO_CAUSE_MASK_SW)); |
136 | } | 136 | } |
137 | 137 | ||
138 | void wil6210_disable_irq(struct wil6210_priv *wil) | 138 | void wil_mask_irq(struct wil6210_priv *wil) |
139 | { | 139 | { |
140 | wil_dbg_irq(wil, "%s()\n", __func__); | 140 | wil_dbg_irq(wil, "%s()\n", __func__); |
141 | 141 | ||
@@ -145,7 +145,7 @@ void wil6210_disable_irq(struct wil6210_priv *wil) | |||
145 | wil6210_mask_irq_pseudo(wil); | 145 | wil6210_mask_irq_pseudo(wil); |
146 | } | 146 | } |
147 | 147 | ||
148 | void wil6210_enable_irq(struct wil6210_priv *wil) | 148 | void wil_unmask_irq(struct wil6210_priv *wil) |
149 | { | 149 | { |
150 | wil_dbg_irq(wil, "%s()\n", __func__); | 150 | wil_dbg_irq(wil, "%s()\n", __func__); |
151 | 151 | ||
@@ -546,7 +546,7 @@ void wil6210_fini_irq(struct wil6210_priv *wil, int irq) | |||
546 | { | 546 | { |
547 | wil_dbg_misc(wil, "%s()\n", __func__); | 547 | wil_dbg_misc(wil, "%s()\n", __func__); |
548 | 548 | ||
549 | wil6210_disable_irq(wil); | 549 | wil_mask_irq(wil); |
550 | free_irq(irq, wil); | 550 | free_irq(irq, wil); |
551 | if (wil->n_msi == 3) { | 551 | if (wil->n_msi == 3) { |
552 | free_irq(irq + 1, wil); | 552 | free_irq(irq + 1, wil); |
diff --git a/drivers/net/wireless/ath/wil6210/main.c b/drivers/net/wireless/ath/wil6210/main.c index 0857853f675c..8443d827d2f8 100644 --- a/drivers/net/wireless/ath/wil6210/main.c +++ b/drivers/net/wireless/ath/wil6210/main.c | |||
@@ -496,7 +496,7 @@ int wil_reset(struct wil6210_priv *wil) | |||
496 | wil->scan_request = NULL; | 496 | wil->scan_request = NULL; |
497 | } | 497 | } |
498 | 498 | ||
499 | wil6210_disable_irq(wil); | 499 | wil_mask_irq(wil); |
500 | 500 | ||
501 | wmi_event_flush(wil); | 501 | wmi_event_flush(wil); |
502 | 502 | ||
@@ -539,7 +539,7 @@ int wil_reset(struct wil6210_priv *wil) | |||
539 | reinit_completion(&wil->wmi_ready); | 539 | reinit_completion(&wil->wmi_ready); |
540 | reinit_completion(&wil->wmi_call); | 540 | reinit_completion(&wil->wmi_call); |
541 | 541 | ||
542 | wil6210_enable_irq(wil); | 542 | wil_unmask_irq(wil); |
543 | 543 | ||
544 | /* we just started MAC, wait for FW ready */ | 544 | /* we just started MAC, wait for FW ready */ |
545 | rc = wil_wait_for_fw_ready(wil); | 545 | rc = wil_wait_for_fw_ready(wil); |
diff --git a/drivers/net/wireless/ath/wil6210/wil6210.h b/drivers/net/wireless/ath/wil6210/wil6210.h index f8f99881382d..a54078139cf1 100644 --- a/drivers/net/wireless/ath/wil6210/wil6210.h +++ b/drivers/net/wireless/ath/wil6210/wil6210.h | |||
@@ -532,8 +532,8 @@ int wmi_disconnect_sta(struct wil6210_priv *wil, const u8 *mac, u16 reason); | |||
532 | void wil6210_clear_irq(struct wil6210_priv *wil); | 532 | void wil6210_clear_irq(struct wil6210_priv *wil); |
533 | int wil6210_init_irq(struct wil6210_priv *wil, int irq); | 533 | int wil6210_init_irq(struct wil6210_priv *wil, int irq); |
534 | void wil6210_fini_irq(struct wil6210_priv *wil, int irq); | 534 | void wil6210_fini_irq(struct wil6210_priv *wil, int irq); |
535 | void wil6210_disable_irq(struct wil6210_priv *wil); | 535 | void wil_mask_irq(struct wil6210_priv *wil); |
536 | void wil6210_enable_irq(struct wil6210_priv *wil); | 536 | void wil_unmask_irq(struct wil6210_priv *wil); |
537 | int wil_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, | 537 | int wil_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, |
538 | struct cfg80211_mgmt_tx_params *params, | 538 | struct cfg80211_mgmt_tx_params *params, |
539 | u64 *cookie); | 539 | u64 *cookie); |