diff options
author | David Herrmann <dh.herrmann@gmail.com> | 2014-01-29 07:12:31 -0500 |
---|---|---|
committer | David Herrmann <dh.herrmann@gmail.com> | 2014-03-16 07:25:19 -0400 |
commit | 5817878c6f4221c3ace4af63260080635063371e (patch) | |
tree | ba64249ef8d6e98bcc4384158fea1fac59cf30a4 /drivers/gpu/drm/drm_drv.c | |
parent | cb0f93238b89c6178842ba89ecc1cd311f1a3e75 (diff) |
drm: remove redundant minor->device field
Whenever we access minor->device, we are in a minor->kdev->...->fops
callback so the minor->kdev pointer *must* be valid. Thus, simply use
minor->kdev->devt instead of minor->device and remove the redundant field.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/drm_drv.c')
-rw-r--r-- | drivers/gpu/drm/drm_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 345be03c23db..ec651be2f3cb 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c | |||
@@ -344,7 +344,7 @@ long drm_ioctl(struct file *filp, | |||
344 | 344 | ||
345 | DRM_DEBUG("pid=%d, dev=0x%lx, auth=%d, %s\n", | 345 | DRM_DEBUG("pid=%d, dev=0x%lx, auth=%d, %s\n", |
346 | task_pid_nr(current), | 346 | task_pid_nr(current), |
347 | (long)old_encode_dev(file_priv->minor->device), | 347 | (long)old_encode_dev(file_priv->minor->kdev->devt), |
348 | file_priv->authenticated, ioctl->name); | 348 | file_priv->authenticated, ioctl->name); |
349 | 349 | ||
350 | /* Do not trust userspace, use our own definition */ | 350 | /* Do not trust userspace, use our own definition */ |
@@ -402,7 +402,7 @@ long drm_ioctl(struct file *filp, | |||
402 | if (!ioctl) | 402 | if (!ioctl) |
403 | DRM_DEBUG("invalid ioctl: pid=%d, dev=0x%lx, auth=%d, cmd=0x%02x, nr=0x%02x\n", | 403 | DRM_DEBUG("invalid ioctl: pid=%d, dev=0x%lx, auth=%d, cmd=0x%02x, nr=0x%02x\n", |
404 | task_pid_nr(current), | 404 | task_pid_nr(current), |
405 | (long)old_encode_dev(file_priv->minor->device), | 405 | (long)old_encode_dev(file_priv->minor->kdev->devt), |
406 | file_priv->authenticated, cmd, nr); | 406 | file_priv->authenticated, cmd, nr); |
407 | 407 | ||
408 | if (kdata != stack_kdata) | 408 | if (kdata != stack_kdata) |