diff options
author | Dave Airlie <airlied@linux.ie> | 2007-07-11 01:27:12 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2007-07-11 01:27:12 -0400 |
commit | c60ce623bd16137627009d05e311d877729f2ad6 (patch) | |
tree | 4d06337a217ccc6c21f8ad96c3b342a1e9452057 /drivers/char/drm/drm_lock.c | |
parent | c6c656b4b6ddfc964f1a43394bf86bc76c5e8119 (diff) |
drm: remove a bunch of typedefs on the userspace interface
This moves a bunch of typedefs into a !defined __KERNEL__ to keep userspace
API compatiblity, it changes all internal usages to structs/enum/unions.
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/drm_lock.c')
-rw-r--r-- | drivers/char/drm/drm_lock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/drm/drm_lock.c b/drivers/char/drm/drm_lock.c index befd1af19dfe..62f12e745249 100644 --- a/drivers/char/drm/drm_lock.c +++ b/drivers/char/drm/drm_lock.c | |||
@@ -54,12 +54,12 @@ int drm_lock(struct inode *inode, struct file *filp, | |||
54 | drm_file_t *priv = filp->private_data; | 54 | drm_file_t *priv = filp->private_data; |
55 | drm_device_t *dev = priv->head->dev; | 55 | drm_device_t *dev = priv->head->dev; |
56 | DECLARE_WAITQUEUE(entry, current); | 56 | DECLARE_WAITQUEUE(entry, current); |
57 | drm_lock_t lock; | 57 | struct drm_lock lock; |
58 | int ret = 0; | 58 | int ret = 0; |
59 | 59 | ||
60 | ++priv->lock_count; | 60 | ++priv->lock_count; |
61 | 61 | ||
62 | if (copy_from_user(&lock, (drm_lock_t __user *) arg, sizeof(lock))) | 62 | if (copy_from_user(&lock, (struct drm_lock __user *) arg, sizeof(lock))) |
63 | return -EFAULT; | 63 | return -EFAULT; |
64 | 64 | ||
65 | if (lock.context == DRM_KERNEL_CONTEXT) { | 65 | if (lock.context == DRM_KERNEL_CONTEXT) { |
@@ -154,10 +154,10 @@ int drm_unlock(struct inode *inode, struct file *filp, | |||
154 | { | 154 | { |
155 | drm_file_t *priv = filp->private_data; | 155 | drm_file_t *priv = filp->private_data; |
156 | drm_device_t *dev = priv->head->dev; | 156 | drm_device_t *dev = priv->head->dev; |
157 | drm_lock_t lock; | 157 | struct drm_lock lock; |
158 | unsigned long irqflags; | 158 | unsigned long irqflags; |
159 | 159 | ||
160 | if (copy_from_user(&lock, (drm_lock_t __user *) arg, sizeof(lock))) | 160 | if (copy_from_user(&lock, (struct drm_lock __user *) arg, sizeof(lock))) |
161 | return -EFAULT; | 161 | return -EFAULT; |
162 | 162 | ||
163 | if (lock.context == DRM_KERNEL_CONTEXT) { | 163 | if (lock.context == DRM_KERNEL_CONTEXT) { |