OMAPDSS: Remove all references obsolete HDMI audio callbacks
PATCH 12/12 OMAPDSS: Remove all references obsolete HDMI audio callbacks
In reply to a message not in the archiveIn new model these callbacks are obsolete since the ASoC component drivers are integrated into the HDMI drivers and no callbacks are needed anymore.
Signed-off-by Jyri Sarha <[email protected]>
--- .../fbdev/omap2/displays-new/connector-hdmi.c | 99 -------------------- .../fbdev/omap2/displays-new/encoder-tpd12s015.c | 56 ----------- include/video/omapdss.h | 31 ------ 3 files changed, 186 deletions(-)
drivers/video/fbdev/omap2/displays-new/connector-hdmi.c +0 -99
@@ -170,98 +170,6 @@ static bool hdmic_detect(struct omap_dss_device *dssdev)return in->ops.hdmi->detect (in); } -static int hdmic_audio_enable (struct omap_dss_device *dssdev) -{ -struct panel_drv_data *ddata =to_panel_data (dssdev); -struct omap_dss_device *in = ddata->in; -int r; - -/* enable audio only if the display is active */ -if (!omapdss_device_is_enabled (dssdev)) -return -EPERM ; - - r = in->ops.hdmi->audio_enable (in); -if (r) -return r; - - dssdev->audio_state =OMAP_DSS_AUDIO_ENABLED ; - -return 0 ; -} - -static void hdmic_audio_disable (struct omap_dss_device *dssdev) -{ -struct panel_drv_data *ddata =to_panel_data (dssdev); -struct omap_dss_device *in = ddata->in; - - in->ops.hdmi->audio_disable (in); - - dssdev->audio_state =OMAP_DSS_AUDIO_DISABLED ; -} - -static int hdmic_audio_start (struct omap_dss_device *dssdev) -{ -struct panel_drv_data *ddata =to_panel_data (dssdev); -struct omap_dss_device *in = ddata->in; -int r; - -/* -* No need to check the panel state. It was checked when trasitioning -* to AUDIO_ENABLED. -*/ -if (dssdev->audio_state !=OMAP_DSS_AUDIO_ENABLED ) -return -EPERM ; - - r = in->ops.hdmi->audio_start (in); -if (r) -return r; - - dssdev->audio_state =OMAP_DSS_AUDIO_PLAYING ; - -return 0 ; -} - -static void hdmic_audio_stop (struct omap_dss_device *dssdev) -{ -struct panel_drv_data *ddata =to_panel_data (dssdev); -struct omap_dss_device *in = ddata->in; - - in->ops.hdmi->audio_stop (in); - - dssdev->audio_state =OMAP_DSS_AUDIO_ENABLED ; -} - -static bool hdmic_audio_supported (struct omap_dss_device *dssdev) -{ -struct panel_drv_data *ddata =to_panel_data (dssdev); -struct omap_dss_device *in = ddata->in; - -if (!omapdss_device_is_enabled (dssdev)) -return false; - -return in->ops.hdmi->audio_supported (in); -} - -static int hdmic_audio_config (struct omap_dss_device *dssdev, -struct omap_dss_audio *audio) -{ -struct panel_drv_data *ddata =to_panel_data (dssdev); -struct omap_dss_device *in = ddata->in; -int r; - -/* config audio only if the display is active */ -if (!omapdss_device_is_enabled (dssdev)) -return -EPERM ; - - r = in->ops.hdmi->audio_config (in, audio); -if (r) -return r; - - dssdev->audio_state =OMAP_DSS_AUDIO_CONFIGURED ; - -return 0 ; -} -static int hdmic_set_hdmi_mode (struct omap_dss_device *dssdev,bool hdmi_mode) {struct panel_drv_data *ddata =to_panel_data (dssdev);
@@ -296,13 +204,6 @@ static struct omap_dss_driver hdmic_driver = { .detect = hdmic_detect, .set_hdmi_mode = hdmic_set_hdmi_mode, .set_hdmi_infoframe = hdmic_set_infoframe, - - .audio_enable = hdmic_audio_enable, - .audio_disable = hdmic_audio_disable, - .audio_start = hdmic_audio_start, - .audio_stop = hdmic_audio_stop, - .audio_supported = hdmic_audio_supported, - .audio_config = hdmic_audio_config, };static int hdmic_probe_pdata (struct platform_device *pdev)
drivers/video/fbdev/omap2/displays-new/encoder-tpd12s015.c +0 -56
68 lines not on this page · raw message
include/video/omapdss.h +0 -31
@@ -635,19 +635,6 @@ struct omapdss_hdmi_ops {int (*set_hdmi_mode)(struct omap_dss_device *dssdev,bool hdmi_mode);int (*set_infoframe)(struct omap_dss_device *dssdev,const struct hdmi_avi_infoframe *avi); - -/* -* Note: These functions might sleep. Do not call while -* holding a spinlock/readlock. -*/ -int (*audio_enable)(struct omap_dss_device *dssdev); -void (*audio_disable)(struct omap_dss_device *dssdev); -bool (*audio_supported)(struct omap_dss_device *dssdev); -int (*audio_config)(struct omap_dss_device *dssdev, -struct omap_dss_audio *audio); -/* Note: These functions may not sleep */ -int (*audio_start)(struct omap_dss_device *dssdev); -void (*audio_stop)(struct omap_dss_device *dssdev); };struct omapdss_dsi_ops {
@@ -858,24 +845,6 @@ struct omap_dss_driver {int (*set_hdmi_mode)(struct omap_dss_device *dssdev,bool hdmi_mode);int (*set_hdmi_infoframe)(struct omap_dss_device *dssdev,const struct hdmi_avi_infoframe *avi); - -/* -* For display drivers that support audio. This encompasses -* HDMI and DisplayPort at the moment. -*/ -/* -* Note: These functions might sleep. Do not call while -* holding a spinlock/readlock. -*/ -int (*audio_enable)(struct omap_dss_device *dssdev); -void (*audio_disable)(struct omap_dss_device *dssdev); -bool (*audio_supported)(struct omap_dss_device *dssdev); -int (*audio_config)(struct omap_dss_device *dssdev, -struct omap_dss_audio *audio); -/* Note: These functions may not sleep */ -int (*audio_start)(struct omap_dss_device *dssdev); -void (*audio_stop)(struct omap_dss_device *dssdev); - };enum omapdss_version omapdss_get_version (void );
Signature · 1 line
1.7.9.5
Please ignore this orphan patch.
Best regards,
Jyri