drm: Replace DRM_IOCTL_ARGS with (dev, data, file_priv) and remove DRM_DEVICE.

The data is now in kernel space, copied in/out as appropriate according to t
This results in DRM_COPY_{TO,FROM}_USER going away, and error paths to deal
with those failures.  This also means that XFree86 4.2.0 support for i810 DR
is lost.

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

1 files changed, 15 insertions, 21 deletions

diff --git a/drivers/char/drm/drm_auth.c b/drivers/char/drm/drm_auth.c
index dc66cfef7ec3..a73462723d2d 100644
--- a/drivers/char/drm/drm_auth.c
+++ b/drivers/char/drm/drm_auth.c
@@ -137,32 +137,29 @@ static int drm_remove_magic(struct drm_device * dev, drm_magic_t magic)
  * searches an unique non-zero magic number and add it associating it with \p
  * file_priv.
  */
-int drm_getmagic(struct inode *inode, struct drm_file *file_priv,
-                 unsigned int cmd, unsigned long arg)
+int drm_getmagic(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
         static drm_magic_t sequence = 0;
         static DEFINE_SPINLOCK(lock);
-        struct drm_device *dev = file_priv->head->dev;
-        struct drm_auth auth;
+        struct drm_auth *auth = data;
 
         /* Find unique magic */
         if (file_priv->magic) {
-                auth.magic = file_priv->magic;
+                auth->magic = file_priv->magic;
         } else {
                 do {
                         spin_lock(&lock);
                         if (!sequence)
                                 ++sequence;     /* reserve 0 */
-                        auth.magic = sequence++;
+                        auth->magic = sequence++;
                         spin_unlock(&lock);
-                } while (drm_find_file(dev, auth.magic));
-                file_priv->magic = auth.magic;
-                drm_add_magic(dev, file_priv, auth.magic);
+                } while (drm_find_file(dev, auth->magic));
+                file_priv->magic = auth->magic;
+                drm_add_magic(dev, file_priv, auth->magic);
         }
 
-        DRM_DEBUG("%u\n", auth.magic);
-        if (copy_to_user((struct drm_auth __user *) arg, &auth, sizeof(auth)))
-                return -EFAULT;
+        DRM_DEBUG("%u\n", auth->magic);
+
         return 0;
 }
 
@@ -177,19 +174,16 @@ int drm_getmagic(struct inode *inode, struct drm_file *file_priv,
  *
  * Checks if \p file_priv is associated with the magic number passed in \arg.
  */
-int drm_authmagic(struct inode *inode, struct drm_file *file_priv,
-                  unsigned int cmd, unsigned long arg)
+int drm_authmagic(struct drm_device *dev, void *data,
+                  struct drm_file *file_priv)
 {
-        struct drm_device *dev = file_priv->head->dev;
-        struct drm_auth auth;
+        struct drm_auth *auth = data;
         struct drm_file *file;
 
-        if (copy_from_user(&auth, (struct drm_auth __user *) arg, sizeof(auth)))
-                return -EFAULT;
-        DRM_DEBUG("%u\n", auth.magic);
-        if ((file = drm_find_file(dev, auth.magic))) {
+        DRM_DEBUG("%u\n", auth->magic);
+        if ((file = drm_find_file(dev, auth->magic))) {
                 file->authenticated = 1;
-                drm_remove_magic(dev, auth.magic);
+                drm_remove_magic(dev, auth->magic);
                 return 0;
         }
         return -EINVAL;