diff options
author | Dave Airlie <airlied@linux.ie> | 2007-11-04 20:48:34 -0500 |
---|---|---|
committer | Dave Airlie <airlied@optimus.(none)> | 2007-11-05 19:11:12 -0500 |
commit | 747824c67b31b5d6e9379fae8af2ef46cf715f62 (patch) | |
tree | 96f9a1870c1c0657152373e3012d2062035ddb87 | |
parent | f9618ac08b37992c80ca320b3463559873726837 (diff) |
drm: remove remnants of DRM_COPY_FROM/TO_USER_IOCTL
This is a bug in the savage driver since I introduced these changes.
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r-- | drivers/char/drm/drm_os_linux.h | 8 | ||||
-rw-r--r-- | drivers/char/drm/savage_bci.c | 3 |
2 files changed, 0 insertions, 11 deletions
diff --git a/drivers/char/drm/drm_os_linux.h b/drivers/char/drm/drm_os_linux.h index 76e44ac94fb5..daa69c9d8977 100644 --- a/drivers/char/drm/drm_os_linux.h +++ b/drivers/char/drm/drm_os_linux.h | |||
@@ -62,14 +62,6 @@ static __inline__ int mtrr_del(int reg, unsigned long base, unsigned long size) | |||
62 | 62 | ||
63 | #endif | 63 | #endif |
64 | 64 | ||
65 | /** For data going into the kernel through the ioctl argument */ | ||
66 | #define DRM_COPY_FROM_USER_IOCTL(arg1, arg2, arg3) \ | ||
67 | if ( copy_from_user(&arg1, arg2, arg3) ) \ | ||
68 | return -EFAULT | ||
69 | /** For data going from the kernel through the ioctl argument */ | ||
70 | #define DRM_COPY_TO_USER_IOCTL(arg1, arg2, arg3) \ | ||
71 | if ( copy_to_user(arg1, &arg2, arg3) ) \ | ||
72 | return -EFAULT | ||
73 | /** Other copying of data to kernel space */ | 65 | /** Other copying of data to kernel space */ |
74 | #define DRM_COPY_FROM_USER(arg1, arg2, arg3) \ | 66 | #define DRM_COPY_FROM_USER(arg1, arg2, arg3) \ |
75 | copy_from_user(arg1, arg2, arg3) | 67 | copy_from_user(arg1, arg2, arg3) |
diff --git a/drivers/char/drm/savage_bci.c b/drivers/char/drm/savage_bci.c index 59484d56b333..d465b2f9c1cd 100644 --- a/drivers/char/drm/savage_bci.c +++ b/drivers/char/drm/savage_bci.c | |||
@@ -968,9 +968,6 @@ static int savage_bci_event_wait(struct drm_device *dev, void *data, struct drm_ | |||
968 | 968 | ||
969 | DRM_DEBUG("\n"); | 969 | DRM_DEBUG("\n"); |
970 | 970 | ||
971 | DRM_COPY_FROM_USER_IOCTL(event, (drm_savage_event_wait_t __user *) data, | ||
972 | sizeof(event)); | ||
973 | |||
974 | UPDATE_EVENT_COUNTER(); | 971 | UPDATE_EVENT_COUNTER(); |
975 | if (dev_priv->status_ptr) | 972 | if (dev_priv->status_ptr) |
976 | hw_e = dev_priv->status_ptr[1] & 0xffff; | 973 | hw_e = dev_priv->status_ptr[1] & 0xffff; |