diff options
Diffstat (limited to 'drivers/char/drm/drm_scatter.c')
-rw-r--r-- | drivers/char/drm/drm_scatter.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/char/drm/drm_scatter.c b/drivers/char/drm/drm_scatter.c index 067d25daaf17..0c2188367e69 100644 --- a/drivers/char/drm/drm_scatter.c +++ b/drivers/char/drm/drm_scatter.c | |||
@@ -62,11 +62,10 @@ void drm_sg_cleanup(struct drm_sg_mem * entry) | |||
62 | # define ScatterHandle(x) (unsigned int)(x) | 62 | # define ScatterHandle(x) (unsigned int)(x) |
63 | #endif | 63 | #endif |
64 | 64 | ||
65 | int drm_sg_alloc(struct inode *inode, struct file *filp, | 65 | int drm_sg_alloc(struct inode *inode, struct drm_file *file_priv, |
66 | unsigned int cmd, unsigned long arg) | 66 | unsigned int cmd, unsigned long arg) |
67 | { | 67 | { |
68 | struct drm_file *priv = filp->private_data; | 68 | struct drm_device *dev = file_priv->head->dev; |
69 | struct drm_device *dev = priv->head->dev; | ||
70 | struct drm_scatter_gather __user *argp = (void __user *)arg; | 69 | struct drm_scatter_gather __user *argp = (void __user *)arg; |
71 | struct drm_scatter_gather request; | 70 | struct drm_scatter_gather request; |
72 | struct drm_sg_mem *entry; | 71 | struct drm_sg_mem *entry; |
@@ -198,11 +197,10 @@ int drm_sg_alloc(struct inode *inode, struct file *filp, | |||
198 | return -ENOMEM; | 197 | return -ENOMEM; |
199 | } | 198 | } |
200 | 199 | ||
201 | int drm_sg_free(struct inode *inode, struct file *filp, | 200 | int drm_sg_free(struct inode *inode, struct drm_file *file_priv, |
202 | unsigned int cmd, unsigned long arg) | 201 | unsigned int cmd, unsigned long arg) |
203 | { | 202 | { |
204 | struct drm_file *priv = filp->private_data; | 203 | struct drm_device *dev = file_priv->head->dev; |
205 | struct drm_device *dev = priv->head->dev; | ||
206 | struct drm_scatter_gather request; | 204 | struct drm_scatter_gather request; |
207 | struct drm_sg_mem *entry; | 205 | struct drm_sg_mem *entry; |
208 | 206 | ||