mdss: mdp: INIT_COMPLETION depricated to reinit_completion

INIT_COMPLETION is removed from 3.14 kernel. Replacing with
reinit_completion.

Change-Id: I64c43e313ff4e07dc7900bdce155f8c55e5ed420
Signed-off-by: Terence Hampson <thampson@codeaurora.org>

14 files changed, 36 insertions, 36 deletions

diff --git a/drivers/video/fbdev/msm/dsi_host_v2.c b/drivers/video/fbdev/msm/dsi_host_v2.c
index 9258143589fa..caad0c649e33 100644
--- a/drivers/video/fbdev/msm/dsi_host_v2.c
+++ b/drivers/video/fbdev/msm/dsi_host_v2.c
@@ -289,7 +289,7 @@ static int msm_dsi_wait4mdp_done(struct mdss_dsi_ctrl_pdata *ctrl)
 	unsigned long flag;
 
 	spin_lock_irqsave(&ctrl->mdp_lock, flag);
-	INIT_COMPLETION(ctrl->mdp_comp);
+	reinit_completion(&ctrl->mdp_comp);
 	msm_dsi_set_irq(ctrl, DSI_INTR_CMD_MDP_DONE_MASK);
 	spin_unlock_irqrestore(&ctrl->mdp_lock, flag);
 
@@ -332,7 +332,7 @@ static int msm_dsi_wait4video_done(struct mdss_dsi_ctrl_pdata *ctrl)
 	unsigned long flag;
 
 	spin_lock_irqsave(&ctrl->mdp_lock, flag);
-	INIT_COMPLETION(ctrl->video_comp);
+	reinit_completion(&ctrl->video_comp);
 	msm_dsi_set_irq(ctrl, DSI_INTR_VIDEO_DONE_MASK);
 	spin_unlock_irqrestore(&ctrl->mdp_lock, flag);
 
@@ -621,7 +621,7 @@ int msm_dsi_cmd_dma_tx(struct mdss_dsi_ctrl_pdata *ctrl,
 	msm_dsi_get_cmd_engine(ctrl);
 
 	spin_lock_irqsave(&ctrl->mdp_lock, flag);
-	INIT_COMPLETION(ctrl->dma_comp);
+	reinit_completion(&ctrl->dma_comp);
 	msm_dsi_set_irq(ctrl, DSI_INTR_CMD_DMA_DONE_MASK);
 	spin_unlock_irqrestore(&ctrl->mdp_lock, flag);
 
@@ -1377,7 +1377,7 @@ static int msm_dsi_bta_status_check(struct mdss_dsi_ctrl_pdata *ctrl_pdata)
 	msm_dsi_clk_ctrl(&ctrl_pdata->panel_data, 1);
 	msm_dsi_cmd_mdp_busy(ctrl_pdata);
 	msm_dsi_set_irq(ctrl_pdata, DSI_INTR_BTA_DONE_MASK);
-	INIT_COMPLETION(ctrl_pdata->bta_comp);
+	reinit_completion(&ctrl_pdata->bta_comp);
 
 	/* BTA trigger */
 	MIPI_OUTP(dsi_host_private->dsi_base + DSI_CMD_MODE_BTA_SW_TRIGGER,
diff --git a/drivers/video/fbdev/msm/mdss_dsi_host.c b/drivers/video/fbdev/msm/mdss_dsi_host.c
index c21d9ceb5ea4..16e023ae00d4 100644
--- a/drivers/video/fbdev/msm/mdss_dsi_host.c
+++ b/drivers/video/fbdev/msm/mdss_dsi_host.c
@@ -749,7 +749,7 @@ int mdss_dsi_bta_status_check(struct mdss_dsi_ctrl_pdata *ctrl_pdata)
 
 	mdss_dsi_clk_ctrl(ctrl_pdata, DSI_ALL_CLKS, 1);
 	spin_lock_irqsave(&ctrl_pdata->mdp_lock, flag);
-	INIT_COMPLETION(ctrl_pdata->bta_comp);
+	reinit_completion(&ctrl_pdata->bta_comp);
 	mdss_dsi_enable_irq(ctrl_pdata, DSI_BTA_TERM);
 	spin_unlock_irqrestore(&ctrl_pdata->mdp_lock, flag);
 	MIPI_OUTP(ctrl_pdata->ctrl_base + 0x098, 0x01); /* trigger  */
@@ -1171,7 +1171,7 @@ static int mdss_dsi_cmd_dma_tx(struct mdss_dsi_ctrl_pdata *ctrl,
 		ctrl->dma_addr = tp->dmap;
 	}
 
-	INIT_COMPLETION(ctrl->dma_comp);
+	reinit_completion(&ctrl->dma_comp);
 
 	if (mdss_dsi_sync_wait_trigger(ctrl)) {
 		/* broadcast same cmd to other panel */
@@ -1268,7 +1268,7 @@ void mdss_dsi_wait4video_done(struct mdss_dsi_ctrl_pdata *ctrl)
 	MIPI_OUTP((ctrl->ctrl_base) + 0x0110, data);
 
 	spin_lock_irqsave(&ctrl->mdp_lock, flag);
-	INIT_COMPLETION(ctrl->video_comp);
+	reinit_completion(&ctrl->video_comp);
 	mdss_dsi_enable_irq(ctrl, DSI_VIDEO_TERM);
 	spin_unlock_irqrestore(&ctrl->mdp_lock, flag);
 
@@ -1304,7 +1304,7 @@ void mdss_dsi_cmd_mdp_start(struct mdss_dsi_ctrl_pdata *ctrl)
 	spin_lock_irqsave(&ctrl->mdp_lock, flag);
 	mdss_dsi_enable_irq(ctrl, DSI_MDP_TERM);
 	ctrl->mdp_busy = true;
-	INIT_COMPLETION(ctrl->mdp_comp);
+	reinit_completion(&ctrl->mdp_comp);
 	MDSS_XLOG(ctrl->ndx, ctrl->mdp_busy, current->pid);
 	spin_unlock_irqrestore(&ctrl->mdp_lock, flag);
 }
diff --git a/drivers/video/fbdev/msm/mdss_edp.c b/drivers/video/fbdev/msm/mdss_edp.c
index af553c621834..b5176760965e 100644
--- a/drivers/video/fbdev/msm/mdss_edp.c
+++ b/drivers/video/fbdev/msm/mdss_edp.c
@@ -616,7 +616,7 @@ int mdss_edp_on(struct mdss_panel_data *pdata)
 		if (gpio_is_valid(edp_drv->gpio_lvl_en))
 			gpio_set_value(edp_drv->gpio_lvl_en, 1);
 
-		INIT_COMPLETION(edp_drv->idle_comp);
+		reinit_completion(&edp_drv->idle_comp);
 		mdss_edp_mainlink_ctrl(edp_drv, 1);
 	} else {
 		mdss_edp_aux_ctrl(edp_drv, 1);
@@ -653,7 +653,7 @@ int mdss_edp_off(struct mdss_panel_data *pdata)
 	/* wait until link training is completed */
 	mutex_lock(&edp_drv->train_mutex);
 
-	INIT_COMPLETION(edp_drv->idle_comp);
+	reinit_completion(&edp_drv->idle_comp);
 	mdss_edp_state_ctrl(edp_drv, ST_PUSH_IDLE);
 
 	ret = wait_for_completion_timeout(&edp_drv->idle_comp,
diff --git a/drivers/video/fbdev/msm/mdss_edp_aux.c b/drivers/video/fbdev/msm/mdss_edp_aux.c
index 63b55a6da846..1856e5109235 100644
--- a/drivers/video/fbdev/msm/mdss_edp_aux.c
+++ b/drivers/video/fbdev/msm/mdss_edp_aux.c
@@ -213,7 +213,7 @@ static int edp_aux_write_cmds(struct mdss_edp_drv_pdata *ep,
 	else
 		ep->aux_cmd_i2c = 0;
 
-	INIT_COMPLETION(ep->aux_comp);
+	reinit_completion(&ep->aux_comp);
 
 	len = edp_cmd_fifo_tx(&ep->txp, ep->base);
 
@@ -265,7 +265,7 @@ static int edp_aux_read_cmds(struct mdss_edp_drv_pdata *ep,
 	else
 		ep->aux_cmd_i2c = 0;
 
-	INIT_COMPLETION(ep->aux_comp);
+	reinit_completion(&ep->aux_comp);
 
 	edp_cmd_fifo_tx(tp, ep->base);
 
diff --git a/drivers/video/fbdev/msm/mdss_fb.c b/drivers/video/fbdev/msm/mdss_fb.c
index fed75daca57d..339e98862fbe 100644
--- a/drivers/video/fbdev/msm/mdss_fb.c
+++ b/drivers/video/fbdev/msm/mdss_fb.c
@@ -160,7 +160,7 @@ static int mdss_fb_notify_update(struct msm_fb_data_type *mfd,
 		mfd->update.is_suspend = 0;
 		ret = 1;
 	} else if (notify == NOTIFY_UPDATE_START) {
-		INIT_COMPLETION(mfd->update.comp);
+		reinit_completion(&mfd->update.comp);
 		mutex_lock(&mfd->update.lock);
 		mfd->update.ref_count++;
 		mutex_unlock(&mfd->update.lock);
@@ -175,7 +175,7 @@ static int mdss_fb_notify_update(struct msm_fb_data_type *mfd,
 			ret = 1;
 		}
 	} else if (notify == NOTIFY_UPDATE_STOP) {
-		INIT_COMPLETION(mfd->no_update.comp);
+		reinit_completion(&mfd->no_update.comp);
 		mutex_lock(&mfd->no_update.lock);
 		mfd->no_update.ref_count++;
 		mutex_unlock(&mfd->no_update.lock);
@@ -187,7 +187,7 @@ static int mdss_fb_notify_update(struct msm_fb_data_type *mfd,
 		to_user = (unsigned int)mfd->no_update.value;
 	} else {
 		if (mdss_fb_is_power_on(mfd)) {
-			INIT_COMPLETION(mfd->power_off_comp);
+			reinit_completion(&mfd->power_off_comp);
 			ret = wait_for_completion_interruptible_timeout(
 						&mfd->power_off_comp, 1 * HZ);
 		}
@@ -891,7 +891,7 @@ static int mdss_fb_resume_sub(struct msm_fb_data_type *mfd)
 	if ((!mfd) || (mfd->key != MFD_KEY))
 		return 0;
 
-	INIT_COMPLETION(mfd->power_set_comp);
+	reinit_completion(&mfd->power_set_comp);
 	mfd->is_power_setting = true;
 	pr_debug("mdss_fb resume index=%d\n", mfd->index);
 
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_cec.c b/drivers/video/fbdev/msm/mdss_hdmi_cec.c
index c303da95ce50..bedb6f99be8c 100644
--- a/drivers/video/fbdev/msm/mdss_hdmi_cec.c
+++ b/drivers/video/fbdev/msm/mdss_hdmi_cec.c
@@ -326,7 +326,7 @@ static int hdmi_cec_msg_send(struct hdmi_cec_ctrl *cec_ctrl,
 
 	io = cec_ctrl->init_data.io;
 
-	INIT_COMPLETION(cec_ctrl->cec_msg_wr_done);
+	reinit_completion(&cec_ctrl->cec_msg_wr_done);
 	cec_ctrl->cec_msg_wr_status = 0;
 	frame_type = (msg->recvr_id == 15 ? BIT(0) : 0);
 	if (msg->retransmit > 0 && msg->retransmit < RETRANSMIT_MAX_NUM)
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_hdcp.c b/drivers/video/fbdev/msm/mdss_hdmi_hdcp.c
index e8d6e0f8f6af..e243234348f9 100644
--- a/drivers/video/fbdev/msm/mdss_hdmi_hdcp.c
+++ b/drivers/video/fbdev/msm/mdss_hdmi_hdcp.c
@@ -576,7 +576,7 @@ static int hdmi_hdcp_authentication_part1(struct hdmi_hdcp_ctrl *hdcp_ctrl)
 		buf[1], buf[0]);
 
 	/* Write R0' to HDCP registers and check to see if it is a match */
-	INIT_COMPLETION(hdcp_ctrl->r0_checked);
+	reinit_completion(&hdcp_ctrl->r0_checked);
 	DSS_REG_W(io, HDMI_HDCP_RCVPORT_DATA2_0, (((u32)buf[1]) << 8) | buf[0]);
 	timeout_count = wait_for_completion_timeout(
 		&hdcp_ctrl->r0_checked, HZ*2);
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_tx.c b/drivers/video/fbdev/msm/mdss_hdmi_tx.c
index 5146e4d72a41..72b6eef89781 100644
--- a/drivers/video/fbdev/msm/mdss_hdmi_tx.c
+++ b/drivers/video/fbdev/msm/mdss_hdmi_tx.c
@@ -3251,7 +3251,7 @@ static int hdmi_tx_panel_event_handler(struct mdss_panel_data *panel_data,
 		}
 
 		if (hdmi_ctrl->pdata.primary) {
-			INIT_COMPLETION(hdmi_ctrl->hpd_done);
+			reinit_completion(&hdmi_ctrl->hpd_done);
 			rc = hdmi_tx_sysfs_enable_hpd(hdmi_ctrl, true);
 			if (rc) {
 				DEV_ERR("%s: hpd_enable failed. rc=%d\n",
@@ -3290,7 +3290,7 @@ static int hdmi_tx_panel_event_handler(struct mdss_panel_data *panel_data,
 			flush_work(&hdmi_ctrl->power_off_work);
 
 		if (hdmi_ctrl->hpd_feature_on) {
-			INIT_COMPLETION(hdmi_ctrl->hpd_done);
+			reinit_completion(&hdmi_ctrl->hpd_done);
 
 			rc = hdmi_tx_hpd_on(hdmi_ctrl);
 			if (rc)
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_util.c b/drivers/video/fbdev/msm/mdss_hdmi_util.c
index b40ff288551c..60815e80cb14 100644
--- a/drivers/video/fbdev/msm/mdss_hdmi_util.c
+++ b/drivers/video/fbdev/msm/mdss_hdmi_util.c
@@ -309,7 +309,7 @@ again:
 	 *    SEND_RESET = Set to 1 to send reset sequence
 	 *    GO = 0x1 (kicks off hardware)
 	 */
-	INIT_COMPLETION(ddc_ctrl->ddc_sw_done);
+	reinit_completion(&ddc_ctrl->ddc_sw_done);
 	DSS_REG_W_ND(ddc_ctrl->io, HDMI_DDC_CTRL, BIT(0) | BIT(20));
 
 	time_out_count = wait_for_completion_timeout(
@@ -560,7 +560,7 @@ again:
 	 *    transaction1)
 	 *    GO = 0x1 (kicks off hardware)
 	 */
-	INIT_COMPLETION(ddc_ctrl->ddc_sw_done);
+	reinit_completion(&ddc_ctrl->ddc_sw_done);
 	DSS_REG_W_ND(ddc_ctrl->io, HDMI_DDC_CTRL, BIT(0) | BIT(21));
 
 	time_out_count = wait_for_completion_timeout(
@@ -734,7 +734,7 @@ again:
 	 *    transaction1)
 	 *    GO = 0x1 (kicks off hardware)
 	 */
-	INIT_COMPLETION(ddc_ctrl->ddc_sw_done);
+	reinit_completion(&ddc_ctrl->ddc_sw_done);
 	DSS_REG_W_ND(ddc_ctrl->io, HDMI_DDC_CTRL, BIT(0) | BIT(20));
 
 	time_out_count = wait_for_completion_timeout(
diff --git a/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c b/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c
index e941337e3835..5c9b0da67ccf 100644
--- a/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c
+++ b/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c
@@ -710,10 +710,10 @@ int mdss_mdp_cmd_kickoff(struct mdss_mdp_ctl *ctl, void *arg)
 
 	spin_lock_irqsave(&ctx->koff_lock, flags);
 	atomic_inc(&ctx->koff_cnt);
-	INIT_COMPLETION(ctx->pp_comp);
+	reinit_completion(&ctx->pp_comp);
 	if (sctx) {
 		atomic_inc(&sctx->koff_cnt);
-		INIT_COMPLETION(sctx->pp_comp);
+		reinit_completion(&sctx->pp_comp);
 	}
 	spin_unlock_irqrestore(&ctx->koff_lock, flags);
 
@@ -791,7 +791,7 @@ int mdss_mdp_cmd_intfs_stop(struct mdss_mdp_ctl *ctl, int session,
 
 	spin_lock_irqsave(&ctx->clk_lock, flags);
 	if (ctx->rdptr_enabled) {
-		INIT_COMPLETION(ctx->stop_comp);
+		reinit_completion(&ctx->stop_comp);
 		need_wait = 1;
 	}
 	spin_unlock_irqrestore(&ctx->clk_lock, flags);
diff --git a/drivers/video/fbdev/msm/mdss_mdp_intf_video.c b/drivers/video/fbdev/msm/mdss_mdp_intf_video.c
index 62c949ffb1d0..b4760d937182 100644
--- a/drivers/video/fbdev/msm/mdss_mdp_intf_video.c
+++ b/drivers/video/fbdev/msm/mdss_mdp_intf_video.c
@@ -671,7 +671,7 @@ static int mdss_mdp_video_config_fps(struct mdss_mdp_ctl *ctl,
 			}
 
 			video_vsync_irq_enable(ctl, true);
-			INIT_COMPLETION(ctx->vsync_comp);
+			reinit_completion(&ctx->vsync_comp);
 			rc = wait_for_completion_timeout(&ctx->vsync_comp,
 				usecs_to_jiffies(VSYNC_TIMEOUT_US));
 			WARN(rc <= 0, "timeout (%d) vsync interrupt on ctl=%d\n",
@@ -748,7 +748,7 @@ static int mdss_mdp_video_display(struct mdss_mdp_ctl *ctl, void *arg)
 	if (!ctx->wait_pending) {
 		ctx->wait_pending++;
 		video_vsync_irq_enable(ctl, true);
-		INIT_COMPLETION(ctx->vsync_comp);
+		reinit_completion(&ctx->vsync_comp);
 	} else {
 		WARN(1, "commit without wait! ctl=%d", ctl->num);
 	}
diff --git a/drivers/video/fbdev/msm/mdss_mdp_intf_writeback.c b/drivers/video/fbdev/msm/mdss_mdp_intf_writeback.c
index 1c4bc8da68d9..2aa11166f251 100644
--- a/drivers/video/fbdev/msm/mdss_mdp_intf_writeback.c
+++ b/drivers/video/fbdev/msm/mdss_mdp_intf_writeback.c
@@ -644,7 +644,7 @@ static int mdss_mdp_writeback_display(struct mdss_mdp_ctl *ctl, void *arg)
 	mdp_wb_write(ctx, MDSS_MDP_REG_WB_DST_ADDR_SW_STATUS, ctl->is_secure);
 	mdss_mdp_ctl_write(ctl, MDSS_MDP_REG_CTL_FLUSH, flush_bits);
 
-	INIT_COMPLETION(ctx->wb_comp);
+	reinit_completion(&ctx->wb_comp);
 	mdss_mdp_irq_enable(ctx->intr_type, ctx->intf_num);
 
 	ret = mdss_iommu_ctrl(1);
diff --git a/drivers/video/fbdev/msm/mdss_mdp_pp.c b/drivers/video/fbdev/msm/mdss_mdp_pp.c
index 2a3ebb4223f5..163ba11ce083 100644
--- a/drivers/video/fbdev/msm/mdss_mdp_pp.c
+++ b/drivers/video/fbdev/msm/mdss_mdp_pp.c
@@ -3202,8 +3202,8 @@ static int pp_hist_enable(struct pp_hist_col_info *hist_info,
 	hist_info->col_en = true;
 	spin_unlock_irqrestore(&hist_info->hist_lock, flag);
 	hist_info->frame_cnt = req->frame_cnt;
-	INIT_COMPLETION(hist_info->comp);
-	INIT_COMPLETION(hist_info->first_kick);
+	reinit_completion(&hist_info->comp);
+	reinit_completion(&hist_info->first_kick);
 	hist_info->hist_cnt_read = 0;
 	hist_info->hist_cnt_sent = 0;
 	hist_info->hist_cnt_time = 0;
@@ -3749,7 +3749,7 @@ int mdss_mdp_hist_collect(struct mdp_histogram_data *hist)
 			/* reset read requests and re-intialize completions */
 			spin_lock_irqsave(&hists[i]->hist_lock, flag);
 			hists[i]->read_request = 0;
-			INIT_COMPLETION(hists[i]->comp);
+			reinit_completion(&hists[i]->comp);
 			spin_unlock_irqrestore(&hists[i]->hist_lock, flag);
 		}
 		if (ret || temp_ret) {
@@ -3869,7 +3869,7 @@ int mdss_mdp_hist_collect(struct mdp_histogram_data *hist)
 			hist_info = &pipe->pp_res.hist;
 			spin_lock_irqsave(&hist_info->hist_lock, flag);
 			hist_info->read_request = 0;
-			INIT_COMPLETION(hist_info->comp);
+			reinit_completion(&hist_info->comp);
 			spin_unlock_irqrestore(&hist_info->hist_lock, flag);
 			mdss_mdp_pipe_unmap(pipe);
 		}
@@ -4404,7 +4404,7 @@ error:
 	if (!ret) {
 		if (wait) {
 			mutex_lock(&ad->lock);
-			INIT_COMPLETION(ad->comp);
+			reinit_completion(&ad->comp);
 			mutex_unlock(&ad->lock);
 		}
 		if (wait) {
diff --git a/drivers/video/fbdev/msm/mhl_sii8334.c b/drivers/video/fbdev/msm/mhl_sii8334.c
index fd37b0d9b471..650f7675b331 100644
--- a/drivers/video/fbdev/msm/mhl_sii8334.c
+++ b/drivers/video/fbdev/msm/mhl_sii8334.c
@@ -368,7 +368,7 @@ static int mhl_sii_wait_for_rgnd(struct mhl_tx_ctrl *mhl_ctrl)
 		return 0;
 	}
 
-	INIT_COMPLETION(mhl_ctrl->rgnd_done);
+	reinit_completion(&mhl_ctrl->rgnd_done);
 	/*
 	 * after toggling reset line and enabling disc
 	 * tx can take a while to generate intr
@@ -1337,7 +1337,7 @@ int mhl_send_msc_command(struct mhl_tx_ctrl *mhl_ctrl,
 		goto cbus_send_fail;
 	}
 
-	INIT_COMPLETION(mhl_ctrl->msc_cmd_done);
+	reinit_completion(&mhl_ctrl->msc_cmd_done);
 	MHL_SII_REG_NAME_WR(REG_CBUS_PRI_START, start_bit);
 	timeout = wait_for_completion_timeout
 		(&mhl_ctrl->msc_cmd_done, msecs_to_jiffies(T_ABORT_NEXT));