drm: cleanup old compat code and DRM fns from Linux only code

This patch removes some of the old compatibility macros from the DRM,
and removes use of DRM wrappers from Linux specific code.

Signed-off-by: Dave Airlie <airlied@linux.ie>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/char/drm/drm_irq.c b/drivers/char/drm/drm_irq.c
index ebdb7182c4fd..8e484d23e12b 100644
--- a/drivers/char/drm/drm_irq.c
+++ b/drivers/char/drm/drm_irq.c
@@ -255,7 +255,8 @@ int drm_wait_vblank(DRM_IOCTL_ARGS)
         if (!dev->irq)
                 return -EINVAL;
 
-        DRM_COPY_FROM_USER_IOCTL(vblwait, argp, sizeof(vblwait));
+        if (copy_from_user(&vblwait, argp, sizeof(vblwait)))
+                return -EFAULT;
 
         switch (vblwait.request.type & ~_DRM_VBLANK_FLAGS_MASK) {
         case _DRM_VBLANK_RELATIVE:
@@ -329,7 +330,8 @@ int drm_wait_vblank(DRM_IOCTL_ARGS)
         }
 
       done:
-        DRM_COPY_TO_USER_IOCTL(argp, vblwait, sizeof(vblwait));
+        if (copy_to_user(argp, &vblwait, sizeof(vblwait)))
+                return -EFAULT;
 
         return ret;
 }