drm: Kill DRM_COPY_(TO|FROM)_USER

Less yelling ftw!

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>

2 files changed, 5 insertions, 5 deletions

diff --git a/drivers/gpu/drm/savage/savage_bci.c b/drivers/gpu/drm/savage/savage_bci.c
index b17d0710871a..6e673fa968e5 100644
--- a/drivers/gpu/drm/savage/savage_bci.c
+++ b/drivers/gpu/drm/savage/savage_bci.c
@@ -990,10 +990,10 @@ static int savage_bci_get_buffers(struct drm_device *dev,
 
                 buf->file_priv = file_priv;
 
-                if (DRM_COPY_TO_USER(&d->request_indices[i],
+                if (copy_to_user(&d->request_indices[i],
                                      &buf->idx, sizeof(buf->idx)))
                         return -EFAULT;
-                if (DRM_COPY_TO_USER(&d->request_sizes[i],
+                if (copy_to_user(&d->request_sizes[i],
                                      &buf->total, sizeof(buf->total)))
                         return -EFAULT;
 
diff --git a/drivers/gpu/drm/savage/savage_state.c b/drivers/gpu/drm/savage/savage_state.c
index b35e75ed890c..2d3e56d94be3 100644
--- a/drivers/gpu/drm/savage/savage_state.c
+++ b/drivers/gpu/drm/savage/savage_state.c
@@ -992,7 +992,7 @@ int savage_bci_cmdbuf(struct drm_device *dev, void *data, struct drm_file *file_
                 if (kcmd_addr == NULL)
                         return -ENOMEM;
 
-                if (DRM_COPY_FROM_USER(kcmd_addr, cmdbuf->cmd_addr,
+                if (copy_from_user(kcmd_addr, cmdbuf->cmd_addr,
                                        cmdbuf->size * 8))
                 {
                         kfree(kcmd_addr);
@@ -1007,7 +1007,7 @@ int savage_bci_cmdbuf(struct drm_device *dev, void *data, struct drm_file *file_
                         goto done;
                 }
 
-                if (DRM_COPY_FROM_USER(kvb_addr, cmdbuf->vb_addr,
+                if (copy_from_user(kvb_addr, cmdbuf->vb_addr,
                                        cmdbuf->vb_size)) {
                         ret = -EFAULT;
                         goto done;
@@ -1022,7 +1022,7 @@ int savage_bci_cmdbuf(struct drm_device *dev, void *data, struct drm_file *file_
                         goto done;
                 }
 
-                if (DRM_COPY_FROM_USER(kbox_addr, cmdbuf->box_addr,
+                if (copy_from_user(kbox_addr, cmdbuf->box_addr,
                                        cmdbuf->nbox * sizeof(struct drm_clip_rect))) {
                         ret = -EFAULT;
                         goto done;