The get_timings operation from DSS encoders (not to be confused with the identically named operation in omap_dss_driver) is never called. Remove it.
Signed-off-by: Laurent Pinchart laurent.pinchart@ideasonboard.com Reviewed-by: Sebastian Reichel sebastian.reichel@collabora.co.uk --- drivers/gpu/drm/omapdrm/displays/encoder-opa362.c | 11 ----------- drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c | 9 --------- drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c | 9 --------- drivers/gpu/drm/omapdrm/dss/dpi.c | 13 ------------- drivers/gpu/drm/omapdrm/dss/hdmi4.c | 9 --------- drivers/gpu/drm/omapdrm/dss/hdmi5.c | 9 --------- drivers/gpu/drm/omapdrm/dss/omapdss.h | 10 ---------- drivers/gpu/drm/omapdrm/dss/sdi.c | 9 --------- drivers/gpu/drm/omapdrm/dss/venc.c | 13 ------------- 9 files changed, 92 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c index afee1b8b457a..27d63a14efe3 100644 --- a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c +++ b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c @@ -148,16 +148,6 @@ static void opa362_set_timings(struct omap_dss_device *dssdev, in->ops.atv->set_timings(in, vm); }
-static void opa362_get_timings(struct omap_dss_device *dssdev, - struct videomode *vm) -{ - struct panel_drv_data *ddata = to_panel_data(dssdev); - - dev_dbg(dssdev->dev, "get_timings\n"); - - *vm = ddata->vm; -} - static int opa362_check_timings(struct omap_dss_device *dssdev, struct videomode *vm) { @@ -178,7 +168,6 @@ static const struct omapdss_atv_ops opa362_atv_ops = {
.check_timings = opa362_check_timings, .set_timings = opa362_set_timings, - .get_timings = opa362_get_timings, };
static int opa362_probe(struct platform_device *pdev) diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c index ed7ae384c3ed..566c63a3ad59 100644 --- a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c +++ b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c @@ -142,14 +142,6 @@ static void tfp410_set_timings(struct omap_dss_device *dssdev, in->ops.dpi->set_timings(in, vm); }
-static void tfp410_get_timings(struct omap_dss_device *dssdev, - struct videomode *vm) -{ - struct panel_drv_data *ddata = to_panel_data(dssdev); - - *vm = ddata->vm; -} - static int tfp410_check_timings(struct omap_dss_device *dssdev, struct videomode *vm) { @@ -170,7 +162,6 @@ static const struct omapdss_dvi_ops tfp410_dvi_ops = {
.check_timings = tfp410_check_timings, .set_timings = tfp410_set_timings, - .get_timings = tfp410_get_timings, };
static int tfp410_probe_of(struct platform_device *pdev) diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c index d275bf152da5..4753e5455f82 100644 --- a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c +++ b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c @@ -136,14 +136,6 @@ static void tpd_set_timings(struct omap_dss_device *dssdev, in->ops.hdmi->set_timings(in, vm); }
-static void tpd_get_timings(struct omap_dss_device *dssdev, - struct videomode *vm) -{ - struct panel_drv_data *ddata = to_panel_data(dssdev); - - *vm = ddata->vm; -} - static int tpd_check_timings(struct omap_dss_device *dssdev, struct videomode *vm) { @@ -249,7 +241,6 @@ static const struct omapdss_hdmi_ops tpd_hdmi_ops = {
.check_timings = tpd_check_timings, .set_timings = tpd_set_timings, - .get_timings = tpd_get_timings,
.read_edid = tpd_read_edid, .detect = tpd_detect, diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c b/drivers/gpu/drm/omapdrm/dss/dpi.c index 9fcc50217133..5d2d4314055f 100644 --- a/drivers/gpu/drm/omapdrm/dss/dpi.c +++ b/drivers/gpu/drm/omapdrm/dss/dpi.c @@ -491,18 +491,6 @@ static void dpi_set_timings(struct omap_dss_device *dssdev, mutex_unlock(&dpi->lock); }
-static void dpi_get_timings(struct omap_dss_device *dssdev, - struct videomode *vm) -{ - struct dpi_data *dpi = dpi_get_data_from_dssdev(dssdev); - - mutex_lock(&dpi->lock); - - *vm = dpi->vm; - - mutex_unlock(&dpi->lock); -} - static int dpi_check_timings(struct omap_dss_device *dssdev, struct videomode *vm) { @@ -702,7 +690,6 @@ static const struct omapdss_dpi_ops dpi_ops = {
.check_timings = dpi_check_timings, .set_timings = dpi_set_timings, - .get_timings = dpi_get_timings, };
static void dpi_init_output_port(struct dpi_data *dpi, struct device_node *port) diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c index 5879f45f6fc9..b3d7865347a3 100644 --- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c +++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c @@ -296,14 +296,6 @@ static void hdmi_display_set_timing(struct omap_dss_device *dssdev, mutex_unlock(&hdmi->lock); }
-static void hdmi_display_get_timings(struct omap_dss_device *dssdev, - struct videomode *vm) -{ - struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev); - - *vm = hdmi->cfg.vm; -} - static int hdmi_dump_regs(struct seq_file *s, void *p) { struct omap_hdmi *hdmi = s->private; @@ -557,7 +549,6 @@ static const struct omapdss_hdmi_ops hdmi_ops = {
.check_timings = hdmi_display_check_timing, .set_timings = hdmi_display_set_timing, - .get_timings = hdmi_display_get_timings,
.read_edid = hdmi_read_edid, .lost_hotplug = hdmi_lost_hotplug, diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c b/drivers/gpu/drm/omapdrm/dss/hdmi5.c index ae1a001d1b83..8e9b3a24b2ab 100644 --- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c +++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c @@ -293,14 +293,6 @@ static void hdmi_display_set_timing(struct omap_dss_device *dssdev, mutex_unlock(&hdmi->lock); }
-static void hdmi_display_get_timings(struct omap_dss_device *dssdev, - struct videomode *vm) -{ - struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev); - - *vm = hdmi->cfg.vm; -} - static int hdmi_dump_regs(struct seq_file *s, void *p) { struct omap_hdmi *hdmi = s->private; @@ -549,7 +541,6 @@ static const struct omapdss_hdmi_ops hdmi_ops = {
.check_timings = hdmi_display_check_timing, .set_timings = hdmi_display_set_timing, - .get_timings = hdmi_display_get_timings,
.read_edid = hdmi_read_edid, .set_infoframe = hdmi_set_infoframe, diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h index 67db0ea272f3..426ac8297f5f 100644 --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h @@ -309,8 +309,6 @@ struct omapdss_dpi_ops { struct videomode *vm); void (*set_timings)(struct omap_dss_device *dssdev, struct videomode *vm); - void (*get_timings)(struct omap_dss_device *dssdev, - struct videomode *vm); };
struct omapdss_sdi_ops { @@ -326,8 +324,6 @@ struct omapdss_sdi_ops { struct videomode *vm); void (*set_timings)(struct omap_dss_device *dssdev, struct videomode *vm); - void (*get_timings)(struct omap_dss_device *dssdev, - struct videomode *vm); };
struct omapdss_dvi_ops { @@ -343,8 +339,6 @@ struct omapdss_dvi_ops { struct videomode *vm); void (*set_timings)(struct omap_dss_device *dssdev, struct videomode *vm); - void (*get_timings)(struct omap_dss_device *dssdev, - struct videomode *vm); };
struct omapdss_atv_ops { @@ -360,8 +354,6 @@ struct omapdss_atv_ops { struct videomode *vm); void (*set_timings)(struct omap_dss_device *dssdev, struct videomode *vm); - void (*get_timings)(struct omap_dss_device *dssdev, - struct videomode *vm); };
struct omapdss_hdmi_ops { @@ -377,8 +369,6 @@ struct omapdss_hdmi_ops { struct videomode *vm); void (*set_timings)(struct omap_dss_device *dssdev, struct videomode *vm); - void (*get_timings)(struct omap_dss_device *dssdev, - struct videomode *vm);
int (*read_edid)(struct omap_dss_device *dssdev, u8 *buf, int len); void (*lost_hotplug)(struct omap_dss_device *dssdev); diff --git a/drivers/gpu/drm/omapdrm/dss/sdi.c b/drivers/gpu/drm/omapdrm/dss/sdi.c index 69c3b7a3d5c7..43cf331e80e4 100644 --- a/drivers/gpu/drm/omapdrm/dss/sdi.c +++ b/drivers/gpu/drm/omapdrm/dss/sdi.c @@ -237,14 +237,6 @@ static void sdi_set_timings(struct omap_dss_device *dssdev, sdi->vm = *vm; }
-static void sdi_get_timings(struct omap_dss_device *dssdev, - struct videomode *vm) -{ - struct sdi_device *sdi = dssdev_to_sdi(dssdev); - - *vm = sdi->vm; -} - static int sdi_check_timings(struct omap_dss_device *dssdev, struct videomode *vm) { @@ -328,7 +320,6 @@ static const struct omapdss_sdi_ops sdi_ops = {
.check_timings = sdi_check_timings, .set_timings = sdi_set_timings, - .get_timings = sdi_get_timings, };
static void sdi_init_output(struct sdi_device *sdi) diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c index c573254df766..ab0eeec38db0 100644 --- a/drivers/gpu/drm/omapdrm/dss/venc.c +++ b/drivers/gpu/drm/omapdrm/dss/venc.c @@ -614,18 +614,6 @@ static int venc_check_timings(struct omap_dss_device *dssdev, } }
-static void venc_get_timings(struct omap_dss_device *dssdev, - struct videomode *vm) -{ - struct venc_device *venc = dssdev_to_venc(dssdev); - - mutex_lock(&venc->venc_lock); - - *vm = venc->vm; - - mutex_unlock(&venc->venc_lock); -} - static int venc_init_regulator(struct venc_device *venc) { struct regulator *vdda_dac; @@ -771,7 +759,6 @@ static const struct omapdss_atv_ops venc_ops = {
.check_timings = venc_check_timings, .set_timings = venc_set_timings, - .get_timings = venc_get_timings, };
static void venc_init_output(struct venc_device *venc)