drm/omap: dss: Move and rename omap_dss_(get|put)_device()

The functions operate on any omap_dss_device, move them from display.c
to base.c. While at it rename them to match the naming of the other
functions operating on struct omap_dss_device.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index 4f402eb8088d..a3b7dbf1b92b 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -161,7 +161,7 @@ static void omap_disconnect_dssdevs(struct drm_device *ddev)
 
                 omapdss_device_disconnect(dssdev, NULL);
                 priv->dssdevs[i] = NULL;
-                omap_dss_put_device(dssdev);
+                omapdss_device_put(dssdev);
         }
 
         priv->num_dssdevs = 0;
@@ -191,17 +191,17 @@ static int omap_connect_dssdevs(struct drm_device *ddev)
         for_each_dss_display(dssdev) {
                 r = omapdss_device_connect(dssdev, NULL);
                 if (r == -EPROBE_DEFER) {
-                        omap_dss_put_device(dssdev);
+                        omapdss_device_put(dssdev);
                         goto cleanup;
                 } else if (r) {
                         dev_warn(dssdev->dev, "could not connect display: %s\n",
                                 dssdev->name);
                 } else {
-                        omap_dss_get_device(dssdev);
+                        omapdss_device_get(dssdev);
                         priv->dssdevs[priv->num_dssdevs++] = dssdev;
                         if (priv->num_dssdevs == ARRAY_SIZE(priv->dssdevs)) {
                                 /* To balance the 'for_each_dss_display' loop */
-                                omap_dss_put_device(dssdev);
+                                omapdss_device_put(dssdev);
                                 break;
                         }
                 }