Merge "msm: mdss: remove HDMI connected flags" (de3a51ca) · Commits · e / devices / android_kernel_sony_msm8998

drivers/platform/msm/msm_ext_display.c

+2 −11

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@ struct msm_ext_disp {
		struct list_head display_list;
		struct mutex lock;
		struct completion hpd_comp;
		u32 flags;
		};

		static int msm_ext_disp_get_intf_data(struct msm_ext_disp *ext_disp,
		@@ -288,7 +287,6 @@ static bool msm_ext_disp_validate_connect(struct msm_ext_disp *ext_disp,
		if (ext_disp->current_disp != type)
		return false;
		end:
		ext_disp->flags \|= flags;
		ext_disp->current_disp = type;
		return true;
		}
		@@ -304,15 +302,9 @@ static bool msm_ext_disp_validate_disconnect(struct msm_ext_disp *ext_disp,
		if (ext_disp->current_disp != type)
		return false;

		/* allow only an already connected type */
		if (ext_disp->flags & flags) {
		ext_disp->flags &= ~flags;
		return true;
		}

		return false;
		}

		static int msm_ext_disp_hpd(struct platform_device *pdev,
		enum msm_ext_disp_type type,
		enum msm_ext_disp_cable_state state,
		@@ -378,7 +370,6 @@ static int msm_ext_disp_hpd(struct platform_device *pdev,
		msm_ext_disp_update_audio_ops(ext_disp, type, state, flags);
		msm_ext_disp_process_display(ext_disp, type, state, flags);

		if (!ext_disp->flags)
		ext_disp->current_disp = EXT_DISPLAY_TYPE_MAX;
		}