evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

msm: mdss: remove unused APIs from external display header

Browse source 
Remove unused APIs from the external display header while
retaining the hdmi audio codec registration API for backward
compatibility.

Change-Id: I62e8d8810280fd42e1db1769ab95be877dc536ed
CRs-Fixed: 1009284
Signed-off-by: Tatenda Chipeperekwa <tatendac@codeaurora.org>
This commit is contained in:
Tatenda Chipeperekwa 2016-08-25 18:54:02 -07:00
parent 79f9bdf53b
commit d54ab561f0
3 changed files with 13 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/video/fbdev/msm/mdss_hdmi_tx.c
View file

@ -2971,28 +2971,6 @@ static int hdmi_tx_get_cable_status(struct platform_device *pdev, u32 vote)
return hpd;
}
int msm_hdmi_register_audio_codec(struct platform_device *pdev,
struct msm_ext_disp_audio_codec_ops *ops)
{
struct hdmi_tx_ctrl *hdmi_ctrl = platform_get_drvdata(pdev);
int ret = 0;
if (!hdmi_ctrl || !ops) {
DEV_ERR("%s: invalid input\n", __func__);
return -EPROBE_DEFER;
}
ret = msm_ext_disp_register_audio_codec(hdmi_ctrl->ext_pdev, ops);
if (ret) {
pr_err("%s: failed to register codec\n", __func__);
goto end;
}
end:
return ret;
} /* hdmi_tx_audio_register */
EXPORT_SYMBOL(msm_hdmi_register_audio_codec);
static int hdmi_tx_setup_tmds_clk_rate(struct hdmi_tx_ctrl *hdmi_ctrl)
{
u32 rate = 0;

6
drivers/video/fbdev/msm/msm_ext_display.c
View file

@ -636,6 +636,12 @@ end:
return ret;
}
int msm_hdmi_register_audio_codec(struct platform_device *pdev,
struct msm_ext_disp_audio_codec_ops *ops)
{
return msm_ext_disp_register_audio_codec(pdev, ops);
}
int msm_ext_disp_register_audio_codec(struct platform_device *pdev,
struct msm_ext_disp_audio_codec_ops *ops)
{

55
include/linux/msm_ext_display.h
View file

@ -132,6 +132,13 @@ struct msm_ext_disp_init_data {
int msm_ext_disp_register_audio_codec(struct platform_device *pdev,
struct msm_ext_disp_audio_codec_ops *ops);
/*
* msm_hdmi_register_audio_codec() - wrapper for hdmi audio codec registration
* @pdev: platform device pointer
* @codec_ops: audio codec operations
*/
int msm_hdmi_register_audio_codec(struct platform_device *pdev,
struct msm_ext_disp_audio_codec_ops *ops);
/*
* msm_ext_disp_register_intf() - display interface registration
* @init_data: data needed to register the display interface
@ -139,52 +146,4 @@ int msm_ext_disp_register_audio_codec(struct platform_device *pdev,
int msm_ext_disp_register_intf(struct platform_device *pdev,
struct msm_ext_disp_init_data *init_data);
/* TODO: remove all the display specific functions below */
#ifdef CONFIG_FB_MSM_MDSS_DP_PANEL
int msm_dp_register_audio_codec(struct platform_device *pdev,
struct msm_ext_disp_audio_codec_ops *ops);
#else
static inline int msm_dp_register_audio_codec(struct platform_device *pdev,
struct msm_ext_disp_audio_codec_ops *ops) {
return 0;
}
#endif /* CONFIG_FB_MSM_MDSS_DP_PANEL */
#ifdef CONFIG_FB_MSM_MDSS_HDMI_PANEL
/*
* Register for HDMI cable connect or disconnect notification.
* @param handler callback handler for notification
* @return negative value as error otherwise current status of cable
*/
int register_hdmi_cable_notification(
struct ext_disp_cable_notify *handler);
/*
* Un-register for HDMI cable connect or disconnect notification.
* @param handler callback handler for notification
* @return negative value as error
*/
int unregister_hdmi_cable_notification(
struct ext_disp_cable_notify *handler);
int msm_hdmi_register_audio_codec(struct platform_device *pdev,
struct msm_ext_disp_audio_codec_ops *ops);
#else
static inline int register_hdmi_cable_notification(
struct ext_disp_cable_notify *handler) {
return 0;
}
static inline int unregister_hdmi_cable_notification(
struct ext_disp_cable_notify *handler) {
return 0;
}
static inline int msm_hdmi_register_audio_codec(struct platform_device *pdev,
struct msm_ext_disp_audio_codec_ops *ops) {
return 0;
}
#endif /* CONFIG_FB_MSM_MDSS_HDMI_PANEL */
#endif /*_MSM_EXT_DISPLAY_H_*/