OMAPDSS: Remove all references to obsolete HDMI audio callbacks

In 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 <jsarha@ti.com>
Reviewed-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/video/fbdev/omap2/displays-new/connector-hdmi.c b/drivers/video/fbdev/omap2/displays-new/connector-hdmi.c
index 7b25967a91ebc6235c170e7925ddb229ed8b34df..219f14f596721af92f56bf83001da799bc6e364c 100644 (file)
--- a/drivers/video/fbdev/omap2/displays-new/connector-hdmi.c
+++ b/drivers/video/fbdev/omap2/displays-new/connector-hdmi.c
@@ -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)

diff --git a/drivers/video/fbdev/omap2/displays-new/encoder-tpd12s015.c b/drivers/video/fbdev/omap2/displays-new/encoder-tpd12s015.c
index 1891967b650c61f3123bd465d24c92d1d9cd00ab..c7a3ce2c5120632133985f997cbd8da18e3540d2 100644 (file)
--- a/drivers/video/fbdev/omap2/displays-new/encoder-tpd12s015.c
+++ b/drivers/video/fbdev/omap2/displays-new/encoder-tpd12s015.c
@@ -193,55 +193,6 @@ static bool tpd_detect(struct omap_dss_device *dssdev)
        return gpio_get_value_cansleep(ddata->hpd_gpio);
 }
 
-static int tpd_audio_enable(struct omap_dss_device *dssdev)
-{
-       struct panel_drv_data *ddata = to_panel_data(dssdev);
-       struct omap_dss_device *in = ddata->in;
-
-       return in->ops.hdmi->audio_enable(in);
-}
-
-static void tpd_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);
-}
-
-static int tpd_audio_start(struct omap_dss_device *dssdev)
-{
-       struct panel_drv_data *ddata = to_panel_data(dssdev);
-       struct omap_dss_device *in = ddata->in;
-
-       return in->ops.hdmi->audio_start(in);
-}
-
-static void tpd_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);
-}
-
-static bool tpd_audio_supported(struct omap_dss_device *dssdev)
-{
-       struct panel_drv_data *ddata = to_panel_data(dssdev);
-       struct omap_dss_device *in = ddata->in;
-
-       return in->ops.hdmi->audio_supported(in);
-}
-
-static int tpd_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;
-
-       return in->ops.hdmi->audio_config(in, audio);
-}
-
 static int tpd_set_infoframe(struct omap_dss_device *dssdev,
                const struct hdmi_avi_infoframe *avi)
 {
@@ -275,13 +226,6 @@ static const struct omapdss_hdmi_ops tpd_hdmi_ops = {
        .detect                 = tpd_detect,
        .set_infoframe          = tpd_set_infoframe,
        .set_hdmi_mode          = tpd_set_hdmi_mode,
-
-       .audio_enable           = tpd_audio_enable,
-       .audio_disable          = tpd_audio_disable,
-       .audio_start            = tpd_audio_start,
-       .audio_stop             = tpd_audio_stop,
-       .audio_supported        = tpd_audio_supported,
-       .audio_config           = tpd_audio_config,
 };
 
 static int tpd_probe_pdata(struct platform_device *pdev)

diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index 1db32023396ecd3c301b67785c3fa22cbac2fde9..6a84498ea5135babb4cc7341173e5f176cf88704 100644 (file)
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -166,13 +166,6 @@ enum omap_dss_display_state {
        OMAP_DSS_DISPLAY_ACTIVE,
 };
 
-enum omap_dss_audio_state {
-       OMAP_DSS_AUDIO_DISABLED = 0,
-       OMAP_DSS_AUDIO_ENABLED,
-       OMAP_DSS_AUDIO_CONFIGURED,
-       OMAP_DSS_AUDIO_PLAYING,
-};
-
 struct omap_dss_audio {
        struct snd_aes_iec958 *iec;
        struct snd_cea_861_aud_if *cea;
@@ -635,19 +628,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 {
@@ -783,8 +763,6 @@ struct omap_dss_device {
 
        enum omap_dss_display_state state;
 
-       enum omap_dss_audio_state audio_state;
-
        /* OMAP DSS output specific fields */
 
        struct list_head list;
@@ -861,24 +839,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);