drm: detypedef drm.h and fixup all problems

1 files changed, 13 insertions, 13 deletions

diff --git a/linux-core/drm_drawable.c b/linux-core/drm_drawable.c
index 7129980b..5a2a14f9 100644
--- a/linux-core/drm_drawable.c
+++ b/linux-core/drm_drawable.c
@@ -44,7 +44,7 @@ int drm_adddraw(DRM_IOCTL_ARGS)
 {
 	DRM_DEVICE;
 	unsigned long irqflags;
-	drm_draw_t draw;
+	struct drm_draw draw;
 	int new_id = 0;
 	int ret;
 
@@ -67,7 +67,7 @@ again:
 
 	DRM_DEBUG("%d\n", draw.handle);
 
-	DRM_COPY_TO_USER_IOCTL((drm_draw_t __user *)data, draw, sizeof(draw));
+	DRM_COPY_TO_USER_IOCTL((struct drm_draw __user *)data, draw, sizeof(draw));
 
 	return 0;
 }
@@ -78,10 +78,10 @@ again:
 int drm_rmdraw(DRM_IOCTL_ARGS)
 {
 	DRM_DEVICE;
-	drm_draw_t draw;
+	struct drm_draw draw;
 	unsigned long irqflags;
 
-	DRM_COPY_FROM_USER_IOCTL(draw, (drm_draw_t __user *) data,
+	DRM_COPY_FROM_USER_IOCTL(draw, (struct drm_draw __user *) data,
 				 sizeof(draw));
 
 	spin_lock_irqsave(&dev->drw_lock, irqflags);
@@ -99,13 +99,13 @@ int drm_rmdraw(DRM_IOCTL_ARGS)
 int drm_update_drawable_info(DRM_IOCTL_ARGS)
 {
 	DRM_DEVICE;
-	drm_update_draw_t update;
+	struct drm_update_draw update;
 	unsigned long irqflags;
-	drm_clip_rect_t *rects;
+	struct drm_clip_rect *rects;
 	struct drm_drawable_info *info;
 	int err;
 
-	DRM_COPY_FROM_USER_IOCTL(update, (drm_update_draw_t __user *) data,
+	DRM_COPY_FROM_USER_IOCTL(update, (struct drm_update_draw __user *) data,
 				 sizeof(update));
 
 	info = idr_find(&dev->drw_idr, update.handle);
@@ -123,7 +123,7 @@ int drm_update_drawable_info(DRM_IOCTL_ARGS)
 	switch (update.type) {
 	case DRM_DRAWABLE_CLIPRECTS:
 		if (update.num != info->num_rects) {
-			rects = drm_alloc(update.num * sizeof(drm_clip_rect_t),
+			rects = drm_alloc(update.num * sizeof(struct drm_clip_rect),
 					 DRM_MEM_BUFS);
 		} else
 			rects = info->rects;
@@ -135,7 +135,7 @@ int drm_update_drawable_info(DRM_IOCTL_ARGS)
 		}
 
 		if (update.num && DRM_COPY_FROM_USER(rects,
-						     (drm_clip_rect_t __user *)
+						     (struct drm_clip_rect __user *)
 						     (unsigned long)update.data,
 						     update.num *
 						     sizeof(*rects))) {
@@ -148,7 +148,7 @@ int drm_update_drawable_info(DRM_IOCTL_ARGS)
 
 		if (rects != info->rects) {
 			drm_free(info->rects, info->num_rects *
-				 sizeof(drm_clip_rect_t), DRM_MEM_BUFS);
+				 sizeof(struct drm_clip_rect), DRM_MEM_BUFS);
 		}
 
 		info->rects = rects;
@@ -168,7 +168,7 @@ int drm_update_drawable_info(DRM_IOCTL_ARGS)
 
 error:
 	if (rects != info->rects)
-		drm_free(rects, update.num * sizeof(drm_clip_rect_t),
+		drm_free(rects, update.num * sizeof(struct drm_clip_rect),
 			 DRM_MEM_BUFS);
 
 	return err;
@@ -177,7 +177,7 @@ error:
 /**
  * Caller must hold the drawable spinlock!
  */
-drm_drawable_info_t *drm_get_drawable_info(drm_device_t *dev, drm_drawable_t id)
+struct drm_drawable_info *drm_get_drawable_info(drm_device_t *dev, drm_drawable_t id)
 {
 	return idr_find(&dev->drw_idr, id);
 }
@@ -189,7 +189,7 @@ static int drm_drawable_free(int idr, void *p, void *data)
 
 	if (info) {
 		drm_free(info->rects, info->num_rects *
-			 sizeof(drm_clip_rect_t), DRM_MEM_BUFS);
+			 sizeof(struct drm_clip_rect), DRM_MEM_BUFS);
 		drm_free(info, sizeof(*info), DRM_MEM_BUFS);
 	}