Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[powerpc.git] / drivers / char / drm / radeon_ioc32.c

diff --git a/drivers/char/drm/radeon_ioc32.c b/drivers/char/drm/radeon_ioc32.c
index bfe6122..1f1f9cc 100644 (file)
--- a/drivers/char/drm/radeon_ioc32.c
+++ b/drivers/char/drm/radeon_ioc32.c
@@ -28,7 +28,6 @@
  * IN THE SOFTWARE.
  */
 #include <linux/compat.h>
-#include <linux/ioctl32.h>
 
 #include "drmP.h"
 #include "drm.h"
@@ -93,8 +92,8 @@ static int compat_radeon_cp_init(struct file *file, unsigned int cmd,
                          &init->gart_textures_offset))
                return -EFAULT;
 
-       return drm_ioctl(file->f_dentry->d_inode, file,
-                        DRM_IOCTL_RADEON_CP_INIT, (unsigned long) init);
+       return drm_ioctl(file->f_path.dentry->d_inode, file,
+                        DRM_IOCTL_RADEON_CP_INIT, (unsigned long)init);
 }
 
 typedef struct drm_radeon_clear32 {
@@ -102,8 +101,8 @@ typedef struct drm_radeon_clear32 {
        unsigned int clear_color;
        unsigned int clear_depth;
        unsigned int color_mask;
-       unsigned int depth_mask;   /* misnamed field:  should be stencil */
-       u32          depth_boxes;
+       unsigned int depth_mask;        /* misnamed field:  should be stencil */
+       u32 depth_boxes;
 } drm_radeon_clear32_t;
 
 static int compat_radeon_cp_clear(struct file *file, unsigned int cmd,
@@ -126,8 +125,8 @@ static int compat_radeon_cp_clear(struct file *file, unsigned int cmd,
                          &clr->depth_boxes))
                return -EFAULT;
 
-       return drm_ioctl(file->f_dentry->d_inode, file,
-                        DRM_IOCTL_RADEON_CLEAR, (unsigned long) clr);
+       return drm_ioctl(file->f_path.dentry->d_inode, file,
+                        DRM_IOCTL_RADEON_CLEAR, (unsigned long)clr);
 }
 
 typedef struct drm_radeon_stipple32 {
@@ -137,7 +136,7 @@ typedef struct drm_radeon_stipple32 {
 static int compat_radeon_cp_stipple(struct file *file, unsigned int cmd,
                                    unsigned long arg)
 {
-       drm_radeon_stipple32_t __user *argp = (void __user *) arg;
+       drm_radeon_stipple32_t __user *argp = (void __user *)arg;
        drm_radeon_stipple_t __user *request;
        u32 mask;
 
@@ -146,16 +145,16 @@ static int compat_radeon_cp_stipple(struct file *file, unsigned int cmd,
 
        request = compat_alloc_user_space(sizeof(*request));
        if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
-           || __put_user((unsigned int __user *)(unsigned long) mask,
+           || __put_user((unsigned int __user *)(unsigned long)mask,
                          &request->mask))
                return -EFAULT;
 
-       return drm_ioctl(file->f_dentry->d_inode, file,
-                        DRM_IOCTL_RADEON_STIPPLE, (unsigned long) request);
+       return drm_ioctl(file->f_path.dentry->d_inode, file,
+                        DRM_IOCTL_RADEON_STIPPLE, (unsigned long)request);
 }
 
 typedef struct drm_radeon_tex_image32 {
-       unsigned int x, y;              /* Blit coordinates */
+       unsigned int x, y;      /* Blit coordinates */
        unsigned int width, height;
        u32 data;
 } drm_radeon_tex_image32_t;
@@ -164,7 +163,7 @@ typedef struct drm_radeon_texture32 {
        unsigned int offset;
        int pitch;
        int format;
-       int width;                      /* Texture image coordinates */
+       int width;              /* Texture image coordinates */
        int height;
        u32 image;
 } drm_radeon_texture32_t;
@@ -177,7 +176,7 @@ static int compat_radeon_cp_texture(struct file *file, unsigned int cmd,
        drm_radeon_tex_image32_t img32;
        drm_radeon_tex_image_t __user *image;
 
-       if (copy_from_user(&req32, (void __user *) arg, sizeof(req32)))
+       if (copy_from_user(&req32, (void __user *)arg, sizeof(req32)))
                return -EFAULT;
        if (req32.image == 0)
                return -EINVAL;
@@ -205,13 +204,13 @@ static int compat_radeon_cp_texture(struct file *file, unsigned int cmd,
                          &image->data))
                return -EFAULT;
 
-       return drm_ioctl(file->f_dentry->d_inode, file,
-                        DRM_IOCTL_RADEON_TEXTURE, (unsigned long) request);
+       return drm_ioctl(file->f_path.dentry->d_inode, file,
+                        DRM_IOCTL_RADEON_TEXTURE, (unsigned long)request);
 }
 
 typedef struct drm_radeon_vertex2_32 {
-       int idx;                        /* Index of vertex buffer */
-       int discard;                    /* Client finished with buffer? */
+       int idx;                /* Index of vertex buffer */
+       int discard;            /* Client finished with buffer? */
        int nr_states;
        u32 state;
        int nr_prims;
@@ -224,7 +223,7 @@ static int compat_radeon_cp_vertex2(struct file *file, unsigned int cmd,
        drm_radeon_vertex2_32_t req32;
        drm_radeon_vertex2_t __user *request;
 
-       if (copy_from_user(&req32, (void __user *) arg, sizeof(req32)))
+       if (copy_from_user(&req32, (void __user *)arg, sizeof(req32)))
                return -EFAULT;
 
        request = compat_alloc_user_space(sizeof(*request));
@@ -239,8 +238,8 @@ static int compat_radeon_cp_vertex2(struct file *file, unsigned int cmd,
                          &request->prim))
                return -EFAULT;
 
-       return drm_ioctl(file->f_dentry->d_inode, file,
-                        DRM_IOCTL_RADEON_VERTEX2, (unsigned long) request);
+       return drm_ioctl(file->f_path.dentry->d_inode, file,
+                        DRM_IOCTL_RADEON_VERTEX2, (unsigned long)request);
 }
 
 typedef struct drm_radeon_cmd_buffer32 {
@@ -256,7 +255,7 @@ static int compat_radeon_cp_cmdbuf(struct file *file, unsigned int cmd,
        drm_radeon_cmd_buffer32_t req32;
        drm_radeon_cmd_buffer_t __user *request;
 
-       if (copy_from_user(&req32, (void __user *) arg, sizeof(req32)))
+       if (copy_from_user(&req32, (void __user *)arg, sizeof(req32)))
                return -EFAULT;
 
        request = compat_alloc_user_space(sizeof(*request));
@@ -269,8 +268,8 @@ static int compat_radeon_cp_cmdbuf(struct file *file, unsigned int cmd,
                          &request->boxes))
                return -EFAULT;
 
-       return drm_ioctl(file->f_dentry->d_inode, file,
-                        DRM_IOCTL_RADEON_CMDBUF, (unsigned long) request);
+       return drm_ioctl(file->f_path.dentry->d_inode, file,
+                        DRM_IOCTL_RADEON_CMDBUF, (unsigned long)request);
 }
 
 typedef struct drm_radeon_getparam32 {
@@ -284,7 +283,7 @@ static int compat_radeon_cp_getparam(struct file *file, unsigned int cmd,
        drm_radeon_getparam32_t req32;
        drm_radeon_getparam_t __user *request;
 
-       if (copy_from_user(&req32, (void __user *) arg, sizeof(req32)))
+       if (copy_from_user(&req32, (void __user *)arg, sizeof(req32)))
                return -EFAULT;
 
        request = compat_alloc_user_space(sizeof(*request));
@@ -294,8 +293,8 @@ static int compat_radeon_cp_getparam(struct file *file, unsigned int cmd,
                          &request->value))
                return -EFAULT;
 
-       return drm_ioctl(file->f_dentry->d_inode, file,
-                        DRM_IOCTL_RADEON_GETPARAM, (unsigned long) request);
+       return drm_ioctl(file->f_path.dentry->d_inode, file,
+                        DRM_IOCTL_RADEON_GETPARAM, (unsigned long)request);
 }
 
 typedef struct drm_radeon_mem_alloc32 {
@@ -311,7 +310,7 @@ static int compat_radeon_mem_alloc(struct file *file, unsigned int cmd,
        drm_radeon_mem_alloc32_t req32;
        drm_radeon_mem_alloc_t __user *request;
 
-       if (copy_from_user(&req32, (void __user *) arg, sizeof(req32)))
+       if (copy_from_user(&req32, (void __user *)arg, sizeof(req32)))
                return -EFAULT;
 
        request = compat_alloc_user_space(sizeof(*request));
@@ -323,8 +322,8 @@ static int compat_radeon_mem_alloc(struct file *file, unsigned int cmd,
                          &request->region_offset))
                return -EFAULT;
 
-       return drm_ioctl(file->f_dentry->d_inode, file,
-                        DRM_IOCTL_RADEON_ALLOC, (unsigned long) request);
+       return drm_ioctl(file->f_path.dentry->d_inode, file,
+                        DRM_IOCTL_RADEON_ALLOC, (unsigned long)request);
 }
 
 typedef struct drm_radeon_irq_emit32 {
@@ -337,7 +336,7 @@ static int compat_radeon_irq_emit(struct file *file, unsigned int cmd,
        drm_radeon_irq_emit32_t req32;
        drm_radeon_irq_emit_t __user *request;
 
-       if (copy_from_user(&req32, (void __user *) arg, sizeof(req32)))
+       if (copy_from_user(&req32, (void __user *)arg, sizeof(req32)))
                return -EFAULT;
 
        request = compat_alloc_user_space(sizeof(*request));
@@ -346,8 +345,8 @@ static int compat_radeon_irq_emit(struct file *file, unsigned int cmd,
                          &request->irq_seq))
                return -EFAULT;
 
-       return drm_ioctl(file->f_dentry->d_inode, file,
-                        DRM_IOCTL_RADEON_IRQ_EMIT, (unsigned long) request);
+       return drm_ioctl(file->f_path.dentry->d_inode, file,
+                        DRM_IOCTL_RADEON_IRQ_EMIT, (unsigned long)request);
 }
 
 drm_ioctl_compat_t *radeon_compat_ioctls[] = {
@@ -371,8 +370,7 @@ drm_ioctl_compat_t *radeon_compat_ioctls[] = {
  * \param arg user argument.
  * \return zero on success or negative number on failure.
  */
-long radeon_compat_ioctl(struct file *filp, unsigned int cmd,
-                        unsigned long arg)
+long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 {
        unsigned int nr = DRM_IOCTL_NR(cmd);
        drm_ioctl_compat_t *fn = NULL;
@@ -386,9 +384,9 @@ long radeon_compat_ioctl(struct file *filp, unsigned int cmd,
 
        lock_kernel();          /* XXX for now */
        if (fn != NULL)
-               ret = (*fn)(filp, cmd, arg);
+               ret = (*fn) (filp, cmd, arg);
        else
-               ret = drm_ioctl(filp->f_dentry->d_inode, filp, cmd, arg);
+               ret = drm_ioctl(filp->f_path.dentry->d_inode, filp, cmd, arg);
        unlock_kernel();
 
        return ret;