drm: remove drm_file_t, drm_device_t and drm_head_t typedefs

[safe/jmp/linux-2.6] / drivers / char / drm / sis_mm.c

diff --git a/drivers/char/drm/sis_mm.c b/drivers/char/drm/sis_mm.c
index 6875a2e..59e7f48 100644 (file)
--- a/drivers/char/drm/sis_mm.c
+++ b/drivers/char/drm/sis_mm.c
@@ -123,7 +123,7 @@ static int sis_fb_init(DRM_IOCTL_ARGS)
        return 0;
 }
 
-static int sis_drm_alloc(drm_device_t * dev, drm_file_t * priv,
+static int sis_drm_alloc(struct drm_device *dev, struct drm_file * priv,
                         unsigned long data, int pool)
 {
        drm_sis_private_t *dev_priv = dev->dev_private;
@@ -229,7 +229,7 @@ static int sis_ioctl_agp_alloc(DRM_IOCTL_ARGS)
        return sis_drm_alloc(dev, priv, data, AGP_TYPE);
 }
 
-static drm_local_map_t *sis_reg_init(drm_device_t *dev)
+static drm_local_map_t *sis_reg_init(struct drm_device *dev)
 {
        drm_map_list_t *entry;
        drm_local_map_t *map;
@@ -245,7 +245,7 @@ static drm_local_map_t *sis_reg_init(drm_device_t *dev)
        return NULL;
 }
 
-int sis_idle(drm_device_t *dev)
+int sis_idle(struct drm_device *dev)
 {
        drm_sis_private_t *dev_priv = dev->dev_private;
        uint32_t idle_reg;
@@ -314,10 +314,10 @@ void sis_lastclose(struct drm_device *dev)
        mutex_unlock(&dev->struct_mutex);
 }
 
-void sis_reclaim_buffers_locked(drm_device_t * dev, struct file *filp)
+void sis_reclaim_buffers_locked(struct drm_device * dev, struct file *filp)
 {
        drm_sis_private_t *dev_priv = dev->dev_private;
-       drm_file_t *priv = filp->private_data;
+       struct drm_file *priv = filp->private_data;
 
        mutex_lock(&dev->struct_mutex);
        if (drm_sman_owner_clean(&dev_priv->sman, (unsigned long)priv)) {