The operation is never used, remove it. If the need to set HDMI infoframe arises later, it should be implemented by extending the DRM bridge API.
Signed-off-by: Laurent Pinchart laurent.pinchart@ideasonboard.com --- drivers/gpu/drm/omapdrm/displays/connector-hdmi.c | 10 ---------- drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c | 10 ---------- drivers/gpu/drm/omapdrm/dss/hdmi4.c | 10 ---------- drivers/gpu/drm/omapdrm/dss/hdmi5.c | 10 ---------- drivers/gpu/drm/omapdrm/dss/omapdss.h | 2 -- 5 files changed, 42 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c index ca30ed9da7eb..71a6121f1ed9 100644 --- a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c +++ b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c @@ -260,15 +260,6 @@ static int hdmic_set_hdmi_mode(struct omap_dss_device *dssdev, bool hdmi_mode) return in->ops.hdmi->set_hdmi_mode(in, hdmi_mode); }
-static int hdmic_set_infoframe(struct omap_dss_device *dssdev, - const struct hdmi_avi_infoframe *avi) -{ - struct panel_drv_data *ddata = to_panel_data(dssdev); - struct omap_dss_device *in = ddata->in; - - return in->ops.hdmi->set_infoframe(in, avi); -} - static struct omap_dss_driver hdmic_driver = { .connect = hdmic_connect, .disconnect = hdmic_disconnect, @@ -287,7 +278,6 @@ static struct omap_dss_driver hdmic_driver = { .enable_hpd = hdmic_enable_hpd, .disable_hpd = hdmic_disable_hpd, .set_hdmi_mode = hdmic_set_hdmi_mode, - .set_hdmi_infoframe = hdmic_set_infoframe, };
static irqreturn_t hdmic_hpd_isr(int irq, void *data) diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c index d275bf152da5..efe608ce0f2a 100644 --- a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c +++ b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c @@ -222,15 +222,6 @@ static void tpd_disable_hpd(struct omap_dss_device *dssdev) mutex_unlock(&ddata->hpd_lock); }
-static int tpd_set_infoframe(struct omap_dss_device *dssdev, - const struct hdmi_avi_infoframe *avi) -{ - struct panel_drv_data *ddata = to_panel_data(dssdev); - struct omap_dss_device *in = ddata->in; - - return in->ops.hdmi->set_infoframe(in, avi); -} - static int tpd_set_hdmi_mode(struct omap_dss_device *dssdev, bool hdmi_mode) { @@ -257,7 +248,6 @@ static const struct omapdss_hdmi_ops tpd_hdmi_ops = { .unregister_hpd_cb = tpd_unregister_hpd_cb, .enable_hpd = tpd_enable_hpd, .disable_hpd = tpd_disable_hpd, - .set_infoframe = tpd_set_infoframe, .set_hdmi_mode = tpd_set_hdmi_mode, };
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c index 97c88861d67a..ef31407edc39 100644 --- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c +++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c @@ -530,15 +530,6 @@ static void hdmi_lost_hotplug(struct omap_dss_device *dssdev) hdmi4_cec_set_phys_addr(&hdmi->core, CEC_PHYS_ADDR_INVALID); }
-static int hdmi_set_infoframe(struct omap_dss_device *dssdev, - const struct hdmi_avi_infoframe *avi) -{ - struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev); - - hdmi->cfg.infoframe = *avi; - return 0; -} - static int hdmi_set_hdmi_mode(struct omap_dss_device *dssdev, bool hdmi_mode) { @@ -561,7 +552,6 @@ static const struct omapdss_hdmi_ops hdmi_ops = {
.read_edid = hdmi_read_edid, .lost_hotplug = hdmi_lost_hotplug, - .set_infoframe = hdmi_set_infoframe, .set_hdmi_mode = hdmi_set_hdmi_mode, };
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c b/drivers/gpu/drm/omapdrm/dss/hdmi5.c index d28da9ac3e90..aac159c93cda 100644 --- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c +++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c @@ -522,15 +522,6 @@ static int hdmi_read_edid(struct omap_dss_device *dssdev, return r; }
-static int hdmi_set_infoframe(struct omap_dss_device *dssdev, - const struct hdmi_avi_infoframe *avi) -{ - struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev); - - hdmi->cfg.infoframe = *avi; - return 0; -} - static int hdmi_set_hdmi_mode(struct omap_dss_device *dssdev, bool hdmi_mode) { @@ -552,7 +543,6 @@ static const struct omapdss_hdmi_ops hdmi_ops = { .get_timings = hdmi_display_get_timings,
.read_edid = hdmi_read_edid, - .set_infoframe = hdmi_set_infoframe, .set_hdmi_mode = hdmi_set_hdmi_mode, };
diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h index 8d530057a4b9..85fbf41f4650 100644 --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h @@ -396,8 +396,6 @@ struct omapdss_hdmi_ops { void (*disable_hpd)(struct omap_dss_device *dssdev);
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); };
struct omapdss_dsi_ops {