@@ -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;
}
@@ -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;
}
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 <laurent.pinchart@ideasonboard.com> --- 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(-)