diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
index 15921b361672d35562a6ffcc0005396c9496d738..cda6c312ad052cb0315465bc4371faa99c486e6d 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 3452925ed54db748a7788d78ecf8e819da5f2c2f..6eb4c24d6aa7978fcda4b22cbe5e983aa0e45b64 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;
 	}