drm: remove sarea typedefs

Leave the userspace typedefs in place

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

2 files changed, 15 insertions, 9 deletions

diff --git a/drivers/char/drm/drm_sarea.h b/drivers/char/drm/drm_sarea.h
index 6964d1e9bb3a..f5466966081e 100644
--- a/drivers/char/drm/drm_sarea.h
+++ b/drivers/char/drm/drm_sarea.h
@@ -50,29 +50,35 @@
 #define SAREA_DRAWABLE_CLAIMED_ENTRY    0x80000000
 
 /** SAREA drawable */
-typedef struct drm_sarea_drawable {
+struct drm_sarea_drawable {
         unsigned int stamp;
         unsigned int flags;
-} drm_sarea_drawable_t;
+};
 
 /** SAREA frame */
-typedef struct drm_sarea_frame {
+struct drm_sarea_frame {
         unsigned int x;
         unsigned int y;
         unsigned int width;
         unsigned int height;
         unsigned int fullscreen;
-} drm_sarea_frame_t;
+};
 
 /** SAREA */
-typedef struct drm_sarea {
+struct drm_sarea {
     /** first thing is always the DRM locking structure */
         struct drm_hw_lock lock;
     /** \todo Use readers/writer lock for drm_sarea::drawable_lock */
         struct drm_hw_lock drawable_lock;
-        drm_sarea_drawable_t drawableTable[SAREA_MAX_DRAWABLES];        /**< drawables */
-        drm_sarea_frame_t frame;        /**< frame */
+        struct drm_sarea_drawable drawableTable[SAREA_MAX_DRAWABLES];   /**< drawables */
+        struct drm_sarea_frame frame;   /**< frame */
         drm_context_t dummy_context;
-} drm_sarea_t;
+};
+
+#ifndef __KERNEL__
+typedef struct drm_sarea_drawable drm_sarea_drawable_t;
+typedef struct drm_sarea_frame drm_sarea_frame_t;
+typedef struct drm_sarea drm_sarea_t;
+#endif
 
 #endif                          /* _DRM_SAREA_H_ */
diff --git a/drivers/char/drm/radeon_state.c b/drivers/char/drm/radeon_state.c
index 32d3344674f5..3ddf86f2abf0 100644
--- a/drivers/char/drm/radeon_state.c
+++ b/drivers/char/drm/radeon_state.c
@@ -1415,7 +1415,7 @@ static void radeon_cp_dispatch_swap(struct drm_device * dev)
 static void radeon_cp_dispatch_flip(struct drm_device * dev)
 {
         drm_radeon_private_t *dev_priv = dev->dev_private;
-        drm_sarea_t *sarea = (drm_sarea_t *) dev_priv->sarea->handle;
+        struct drm_sarea *sarea = (struct drm_sarea *) dev_priv->sarea->handle;
         int offset = (dev_priv->sarea_priv->pfCurrentPage == 1)
             ? dev_priv->front_offset : dev_priv->back_offset;
         RING_LOCALS;