drm/gma500: drop use of DRM_UDELAY wrapper

The DRM_UDELAY wrapper from drm_os_linux.h is used in a few places,
all other places calls udelay() with no wrapper.

There is no reason to continue to use this wrapper - so drop it
and direct call udelay().

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190519195526.3422-5-sam@ravnborg.org

diff --git a/drivers/gpu/drm/gma500/mdfld_device.c b/drivers/gpu/drm/gma500/mdfld_device.c
index 585ec2e..edb9b1b 100644 (file)
--- a/drivers/gpu/drm/gma500/mdfld_device.c
+++ b/drivers/gpu/drm/gma500/mdfld_device.c
@@ -344,7 +344,7 @@ static int mdfld_restore_display_registers(struct drm_device *dev, int pipenum)
 
        if (pipenum == 1) {
                /* restore palette (gamma) */
-               /*DRM_UDELAY(50000); */
+               /* udelay(50000); */
                for (i = 0; i < 256; i++)
                        PSB_WVDC32(pipe->palette[i], map->palette + (i << 2));
 
@@ -406,7 +406,7 @@ static int mdfld_restore_display_registers(struct drm_device *dev, int pipenum)
        PSB_WVDC32(pipe->conf, map->conf);
 
        /* restore palette (gamma) */
-       /*DRM_UDELAY(50000); */
+       /* udelay(50000); */
        for (i = 0; i < 256; i++)
                PSB_WVDC32(pipe->palette[i], map->palette + (i << 2));
 

diff --git a/drivers/gpu/drm/gma500/oaktrail_device.c b/drivers/gpu/drm/gma500/oaktrail_device.c
index f0872e2..2d8afbb 100644 (file)
--- a/drivers/gpu/drm/gma500/oaktrail_device.c
+++ b/drivers/gpu/drm/gma500/oaktrail_device.c
@@ -327,7 +327,7 @@ static int oaktrail_restore_display_registers(struct drm_device *dev)
 
        /* Actually enable it */
        PSB_WVDC32(p->dpll, MRST_DPLL_A);
-       DRM_UDELAY(150);
+       udelay(150);
 
        /* Restore mode */
        PSB_WVDC32(p->htotal, HTOTAL_A);

diff --git a/drivers/gpu/drm/gma500/oaktrail_hdmi.c b/drivers/gpu/drm/gma500/oaktrail_hdmi.c
index c6d72de..7973290 100644 (file)
--- a/drivers/gpu/drm/gma500/oaktrail_hdmi.c
+++ b/drivers/gpu/drm/gma500/oaktrail_hdmi.c
@@ -815,7 +815,7 @@ void oaktrail_hdmi_restore(struct drm_device *dev)
        PSB_WVDC32(hdmi_dev->saveDPLL_ADJUST, DPLL_ADJUST);
        PSB_WVDC32(hdmi_dev->saveDPLL_UPDATE, DPLL_UPDATE);
        PSB_WVDC32(hdmi_dev->saveDPLL_CLK_ENABLE, DPLL_CLK_ENABLE);
-       DRM_UDELAY(150);
+       udelay(150);
 
        /* pipe */
        PSB_WVDC32(pipeb->src, PIPEBSRC);