Merge "msm: mdss: hdmi: remove unnecessary logs" (bba41e29) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_hdmi_cec.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -804,17 +804,13 @@ int hdmi_cec_isr(void *input)
		io = cec_ctrl->init_data.io;

		cec_intr = DSS_REG_R_ND(io, HDMI_CEC_INT);
		DEV_DBG("%s: cec interrupt status is [0x%x]\n", __func__, cec_intr);

		if (!cec_ctrl->cec_enabled) {
		DEV_DBG("%s: cec is not enabled. Just clear int and return.\n",
		__func__);
		DSS_REG_W(io, HDMI_CEC_INT, cec_intr);
		return 0;
		}

		cec_status = DSS_REG_R_ND(io, HDMI_CEC_STATUS);
		DEV_DBG("%s: cec status is [0x%x]\n", __func__, cec_status);

		if ((cec_intr & BIT(0)) && (cec_intr & BIT(1))) {
		DEV_DBG("%s: CEC_IRQ_FRAME_WR_DONE\n", __func__);

+0 −2

Original line number	Diff line number	Diff line
		@@ -1364,8 +1364,6 @@ int hdmi_hdcp_isr(void *input)

		/* Ignore HDCP interrupts if HDCP is disabled */
		if (HDCP_STATE_INACTIVE == hdcp_ctrl->hdcp_state) {
		DEV_DBG("%s: HDCP inactive. Just clear int and return.\n",
		__func__);
		DSS_REG_W(io, HDMI_HDCP_INT_CTRL, HDCP_INT_CLR);
		return 0;
		}

+1 −6

Original line number	Diff line number	Diff line
		@@ -2495,7 +2495,6 @@ static int hdmi_tx_audio_info_setup(struct platform_device *pdev,
		}

		if (!hdmi_tx_is_dvi_mode(hdmi_ctrl) && hdmi_ctrl->panel_power_on) {

		/* Map given sample rate to Enum */
		if (sample_rate == 32000)
		sample_rate = AUDIO_SAMPLE_RATE_32KHZ;
		@@ -2523,7 +2522,6 @@ static int hdmi_tx_audio_info_setup(struct platform_device *pdev,
		DEV_ERR("%s: hdmi_tx_audio_iframe_setup failed.rc=%d\n",
		__func__, rc);
		} else {
		DEV_ERR("%s: Error. panel is not on.\n", __func__);
		rc = -EPERM;
		}

		@@ -2540,11 +2538,8 @@ static int hdmi_tx_get_audio_edid_blk(struct platform_device *pdev,
		return -ENODEV;
		}

		if (!hdmi_ctrl->audio_sdev.state) {
		DEV_ERR("%s: failed. HDMI is not connected/ready for audio\n",
		__func__);
		if (!hdmi_ctrl->audio_sdev.state)
		return -EPERM;
		}

		return hdmi_edid_get_audio_blk(
		hdmi_ctrl->feature_data[HDMI_TX_FEAT_EDID], blk);