tree-wide: use reinit_completion instead of INIT_COMPLETION

Use this new function to make code more comprehensible, since we are
reinitialzing the completion, not initializing.

[akpm@linux-foundation.org: linux-next resyncs]
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Acked-by: Linus Walleij <linus.walleij@linaro.org> (personally at LCE13)
Cc: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

9 files changed, 19 insertions, 19 deletions

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
index 09810ddd11ec..a01a6a74ee3a 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
@@ -3537,7 +3537,7 @@ int qlcnic_83xx_resume(struct qlcnic_adapter *adapter)
 
 void qlcnic_83xx_reinit_mbx_work(struct qlcnic_mailbox *mbx)
 {
-        INIT_COMPLETION(mbx->completion);
+        reinit_completion(&mbx->completion);
         set_bit(QLC_83XX_MBX_READY, &mbx->status);
 }
 
diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c
index 6f10b4964726..2cbe1c249996 100644
--- a/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf230.c
@@ -561,7 +561,7 @@ at86rf230_xmit(struct ieee802154_dev *dev, struct sk_buff *skb)
 
         spin_lock_irqsave(&lp->lock, flags);
         lp->is_tx = 1;
-        INIT_COMPLETION(lp->tx_complete);
+        reinit_completion(&lp->tx_complete);
         spin_unlock_irqrestore(&lp->lock, flags);
 
         rc = at86rf230_write_fbuf(lp, skb->data, skb->len);
diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
index 0632d34905c7..c6e46d6e9f75 100644
--- a/drivers/net/ieee802154/mrf24j40.c
+++ b/drivers/net/ieee802154/mrf24j40.c
@@ -343,7 +343,7 @@ static int mrf24j40_tx(struct ieee802154_dev *dev, struct sk_buff *skb)
         if (ret)
                 goto err;
 
-        INIT_COMPLETION(devrec->tx_complete);
+        reinit_completion(&devrec->tx_complete);
 
         /* Set TXNTRIG bit of TXNCON to send packet */
         ret = read_short_reg(devrec, REG_TXNCON, &val);
diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
index 3118d7506734..edae50b52806 100644
--- a/drivers/net/wireless/ath/ath10k/htc.c
+++ b/drivers/net/wireless/ath/ath10k/htc.c
@@ -534,7 +534,7 @@ int ath10k_htc_wait_target(struct ath10k_htc *htc)
         u16 credit_count;
         u16 credit_size;
 
-        INIT_COMPLETION(htc->ctl_resp);
+        reinit_completion(&htc->ctl_resp);
 
         status = ath10k_hif_start(htc->ar);
         if (status) {
@@ -669,7 +669,7 @@ int ath10k_htc_connect_service(struct ath10k_htc *htc,
         req_msg->flags = __cpu_to_le16(flags);
         req_msg->service_id = __cpu_to_le16(conn_req->service_id);
 
-        INIT_COMPLETION(htc->ctl_resp);
+        reinit_completion(&htc->ctl_resp);
 
         status = ath10k_htc_send(htc, ATH10K_HTC_EP_0, skb);
         if (status) {
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 0b1cc516e778..97ac8c87cba2 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -92,7 +92,7 @@ static int ath10k_install_key(struct ath10k_vif *arvif,
 
         lockdep_assert_held(&ar->conf_mutex);
 
-        INIT_COMPLETION(ar->install_key_done);
+        reinit_completion(&ar->install_key_done);
 
         ret = ath10k_send_key(arvif, key, cmd, macaddr);
         if (ret)
@@ -438,7 +438,7 @@ static int ath10k_vdev_start(struct ath10k_vif *arvif)
 
         lockdep_assert_held(&ar->conf_mutex);
 
-        INIT_COMPLETION(ar->vdev_setup_done);
+        reinit_completion(&ar->vdev_setup_done);
 
         arg.vdev_id = arvif->vdev_id;
         arg.dtim_period = arvif->dtim_period;
@@ -491,7 +491,7 @@ static int ath10k_vdev_stop(struct ath10k_vif *arvif)
 
         lockdep_assert_held(&ar->conf_mutex);
 
-        INIT_COMPLETION(ar->vdev_setup_done);
+        reinit_completion(&ar->vdev_setup_done);
 
         ret = ath10k_wmi_vdev_stop(ar, arvif->vdev_id);
         if (ret) {
@@ -1666,7 +1666,7 @@ void ath10k_offchan_tx_work(struct work_struct *work)
                 }
 
                 spin_lock_bh(&ar->data_lock);
-                INIT_COMPLETION(ar->offchan_tx_completed);
+                reinit_completion(&ar->offchan_tx_completed);
                 ar->offchan_tx_skb = skb;
                 spin_unlock_bh(&ar->data_lock);
 
@@ -2476,8 +2476,8 @@ static int ath10k_hw_scan(struct ieee80211_hw *hw,
                 goto exit;
         }
 
-        INIT_COMPLETION(ar->scan.started);
-        INIT_COMPLETION(ar->scan.completed);
+        reinit_completion(&ar->scan.started);
+        reinit_completion(&ar->scan.completed);
         ar->scan.in_progress = true;
         ar->scan.aborting = false;
         ar->scan.is_roc = false;
@@ -2832,9 +2832,9 @@ static int ath10k_remain_on_channel(struct ieee80211_hw *hw,
                 goto exit;
         }
 
-        INIT_COMPLETION(ar->scan.started);
-        INIT_COMPLETION(ar->scan.completed);
-        INIT_COMPLETION(ar->scan.on_channel);
+        reinit_completion(&ar->scan.started);
+        reinit_completion(&ar->scan.completed);
+        reinit_completion(&ar->scan.on_channel);
         ar->scan.in_progress = true;
         ar->scan.aborting = false;
         ar->scan.is_roc = true;
diff --git a/drivers/net/wireless/ath/carl9170/usb.c b/drivers/net/wireless/ath/carl9170/usb.c
index 307bc0ddff99..ca115f33746f 100644
--- a/drivers/net/wireless/ath/carl9170/usb.c
+++ b/drivers/net/wireless/ath/carl9170/usb.c
@@ -773,7 +773,7 @@ void carl9170_usb_stop(struct ar9170 *ar)
         complete_all(&ar->cmd_wait);
 
         /* This is required to prevent an early completion on _start */
-        INIT_COMPLETION(ar->cmd_wait);
+        reinit_completion(&ar->cmd_wait);
 
         /*
          * Note:
diff --git a/drivers/net/wireless/ath/wil6210/main.c b/drivers/net/wireless/ath/wil6210/main.c
index 0a2844c48a60..fd30cddd5882 100644
--- a/drivers/net/wireless/ath/wil6210/main.c
+++ b/drivers/net/wireless/ath/wil6210/main.c
@@ -250,7 +250,7 @@ int wil_reset(struct wil6210_priv *wil)
 
         /* init after reset */
         wil->pending_connect_cid = -1;
-        INIT_COMPLETION(wil->wmi_ready);
+        reinit_completion(&wil->wmi_ready);
 
         /* TODO: release MAC reset */
         wil6210_enable_irq(wil);
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
index d7a974532909..5b5b952d47b1 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
@@ -1148,7 +1148,7 @@ static s32 brcmf_p2p_af_searching_channel(struct brcmf_p2p_info *p2p)
 
         pri_vif = p2p->bss_idx[P2PAPI_BSSCFG_PRIMARY].vif;
 
-        INIT_COMPLETION(afx_hdl->act_frm_scan);
+        reinit_completion(&afx_hdl->act_frm_scan);
         set_bit(BRCMF_P2P_STATUS_FINDING_COMMON_CHANNEL, &p2p->status);
         afx_hdl->is_active = true;
         afx_hdl->peer_chan = P2P_INVALID_CHANNEL;
@@ -1501,7 +1501,7 @@ static s32 brcmf_p2p_tx_action_frame(struct brcmf_p2p_info *p2p,
 
         brcmf_dbg(TRACE, "Enter\n");
 
-        INIT_COMPLETION(p2p->send_af_done);
+        reinit_completion(&p2p->send_af_done);
         clear_bit(BRCMF_P2P_STATUS_ACTION_TX_COMPLETED, &p2p->status);
         clear_bit(BRCMF_P2P_STATUS_ACTION_TX_NOACK, &p2p->status);
 
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
index 7ef0b4a181e1..84d94f572a46 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
@@ -1619,7 +1619,7 @@ static void prepare_read_regs_int(struct zd_usb *usb,
         atomic_set(&intr->read_regs_enabled, 1);
         intr->read_regs.req = req;
         intr->read_regs.req_count = count;
-        INIT_COMPLETION(intr->read_regs.completion);
+        reinit_completion(&intr->read_regs.completion);
         spin_unlock_irq(&intr->lock);
 }