From a25edf0ea6de6780ef9e8dc489a5c14599c48326 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Fri, 2 Mar 2018 22:05:41 +0200 Subject: [PATCH] drm/omap: displays: Don't cast dssdev to panel data unnecessarily The connect handle of the analog TV and HDMI connectors casts the dssdev to panel data only to then access fields of the panel data that are also present in the dssdev. Remove the cast and use dssdev directly. Signed-off-by: Laurent Pinchart Reviewed-by: Sebastian Reichel Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c | 5 ++--- drivers/gpu/drm/omapdrm/displays/connector-hdmi.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c index 15921b361672..cda6c312ad05 100644 --- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c +++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c @@ -43,13 +43,12 @@ static const struct videomode tvc_pal_vm = { static int tvc_connect(struct omap_dss_device *dssdev) { - struct panel_drv_data *ddata = to_panel_data(dssdev); struct omap_dss_device *src; int r; - src = omapdss_of_find_connected_device(ddata->dev->of_node, 0); + src = omapdss_of_find_connected_device(dssdev->dev->of_node, 0); if (IS_ERR_OR_NULL(src)) { - dev_err(ddata->dev, "failed to find video source\n"); + dev_err(dssdev->dev, "failed to find video source\n"); return src ? PTR_ERR(src) : -EINVAL; } diff --git a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c index 3452925ed54d..6eb4c24d6aa7 100644 --- a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c +++ b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c @@ -53,13 +53,12 @@ struct panel_drv_data { static int hdmic_connect(struct omap_dss_device *dssdev) { - struct panel_drv_data *ddata = to_panel_data(dssdev); struct omap_dss_device *src; int r; - src = omapdss_of_find_connected_device(ddata->dev->of_node, 0); + src = omapdss_of_find_connected_device(dssdev->dev->of_node, 0); if (IS_ERR_OR_NULL(src)) { - dev_err(ddata->dev, "failed to find video source\n"); + dev_err(dssdev->dev, "failed to find video source\n"); return src ? PTR_ERR(src) : -EINVAL; } -- 2.39.5