1 files changed, 12 insertions, 14 deletions

diff --git a/drivers/char/drm/drm_auth.c b/drivers/char/drm/drm_auth.c
index 7f777da872cd..dc66cfef7ec3 100644
--- a/drivers/char/drm/drm_auth.c
+++ b/drivers/char/drm/drm_auth.c
@@ -128,27 +128,26 @@ static int drm_remove_magic(struct drm_device * dev, drm_magic_t magic)
  * Get a unique magic number (ioctl).
  *
  * \param inode device inode.
- * \param filp file pointer.
+ * \param file_priv DRM file private.
  * \param cmd command.
  * \param arg pointer to a resulting drm_auth structure.
  * \return zero on success, or a negative number on failure.
  *
  * If there is a magic number in drm_file::magic then use it, otherwise
  * searches an unique non-zero magic number and add it associating it with \p
- * filp.
+ * file_priv.
  */
-int drm_getmagic(struct inode *inode, struct file *filp,
+int drm_getmagic(struct inode *inode, struct drm_file *file_priv,
                  unsigned int cmd, unsigned long arg)
 {
         static drm_magic_t sequence = 0;
         static DEFINE_SPINLOCK(lock);
-        struct drm_file *priv = filp->private_data;
-        struct drm_device *dev = priv->head->dev;
+        struct drm_device *dev = file_priv->head->dev;
         struct drm_auth auth;
 
         /* Find unique magic */
-        if (priv->magic) {
-                auth.magic = priv->magic;
+        if (file_priv->magic) {
+                auth.magic = file_priv->magic;
         } else {
                 do {
                         spin_lock(&lock);
@@ -157,8 +156,8 @@ int drm_getmagic(struct inode *inode, struct file *filp,
                         auth.magic = sequence++;
                         spin_unlock(&lock);
                 } while (drm_find_file(dev, auth.magic));
-                priv->magic = auth.magic;
-                drm_add_magic(dev, priv, auth.magic);
+                file_priv->magic = auth.magic;
+                drm_add_magic(dev, file_priv, auth.magic);
         }
 
         DRM_DEBUG("%u\n", auth.magic);
@@ -171,18 +170,17 @@ int drm_getmagic(struct inode *inode, struct file *filp,
  * Authenticate with a magic.
  *
  * \param inode device inode.
- * \param filp file pointer.
+ * \param file_priv DRM file private.
  * \param cmd command.
  * \param arg pointer to a drm_auth structure.
  * \return zero if authentication successed, or a negative number otherwise.
  *
- * Checks if \p filp is associated with the magic number passed in \arg.
+ * Checks if \p file_priv is associated with the magic number passed in \arg.
  */
-int drm_authmagic(struct inode *inode, struct file *filp,
+int drm_authmagic(struct inode *inode, struct drm_file *file_priv,
                   unsigned int cmd, unsigned long arg)
 {
-        struct drm_file *priv = filp->private_data;
-        struct drm_device *dev = priv->head->dev;
+        struct drm_device *dev = file_priv->head->dev;
         struct drm_auth auth;
         struct drm_file *file;