diff options
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_drv.c')
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_drv.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c index a3004f12b9a3..2603d909f49c 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.c +++ b/drivers/gpu/drm/omapdrm/omap_drv.c | |||
@@ -419,7 +419,7 @@ static int ioctl_gem_info(struct drm_device *dev, void *data, | |||
419 | return ret; | 419 | return ret; |
420 | } | 420 | } |
421 | 421 | ||
422 | static struct drm_ioctl_desc ioctls[DRM_COMMAND_END - DRM_COMMAND_BASE] = { | 422 | static const struct drm_ioctl_desc ioctls[DRM_COMMAND_END - DRM_COMMAND_BASE] = { |
423 | DRM_IOCTL_DEF_DRV(OMAP_GET_PARAM, ioctl_get_param, DRM_UNLOCKED|DRM_AUTH), | 423 | DRM_IOCTL_DEF_DRV(OMAP_GET_PARAM, ioctl_get_param, DRM_UNLOCKED|DRM_AUTH), |
424 | DRM_IOCTL_DEF_DRV(OMAP_SET_PARAM, ioctl_set_param, DRM_UNLOCKED|DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), | 424 | DRM_IOCTL_DEF_DRV(OMAP_SET_PARAM, ioctl_set_param, DRM_UNLOCKED|DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), |
425 | DRM_IOCTL_DEF_DRV(OMAP_GEM_NEW, ioctl_gem_new, DRM_UNLOCKED|DRM_AUTH), | 425 | DRM_IOCTL_DEF_DRV(OMAP_GEM_NEW, ioctl_gem_new, DRM_UNLOCKED|DRM_AUTH), |
@@ -524,12 +524,6 @@ static int dev_open(struct drm_device *dev, struct drm_file *file) | |||
524 | return 0; | 524 | return 0; |
525 | } | 525 | } |
526 | 526 | ||
527 | static int dev_firstopen(struct drm_device *dev) | ||
528 | { | ||
529 | DBG("firstopen: dev=%p", dev); | ||
530 | return 0; | ||
531 | } | ||
532 | |||
533 | /** | 527 | /** |
534 | * lastclose - clean up after all DRM clients have exited | 528 | * lastclose - clean up after all DRM clients have exited |
535 | * @dev: DRM device | 529 | * @dev: DRM device |
@@ -598,7 +592,6 @@ static const struct file_operations omapdriver_fops = { | |||
598 | .release = drm_release, | 592 | .release = drm_release, |
599 | .mmap = omap_gem_mmap, | 593 | .mmap = omap_gem_mmap, |
600 | .poll = drm_poll, | 594 | .poll = drm_poll, |
601 | .fasync = drm_fasync, | ||
602 | .read = drm_read, | 595 | .read = drm_read, |
603 | .llseek = noop_llseek, | 596 | .llseek = noop_llseek, |
604 | }; | 597 | }; |
@@ -609,7 +602,6 @@ static struct drm_driver omap_drm_driver = { | |||
609 | .load = dev_load, | 602 | .load = dev_load, |
610 | .unload = dev_unload, | 603 | .unload = dev_unload, |
611 | .open = dev_open, | 604 | .open = dev_open, |
612 | .firstopen = dev_firstopen, | ||
613 | .lastclose = dev_lastclose, | 605 | .lastclose = dev_lastclose, |
614 | .preclose = dev_preclose, | 606 | .preclose = dev_preclose, |
615 | .postclose = dev_postclose, | 607 | .postclose = dev_postclose, |
@@ -633,7 +625,7 @@ static struct drm_driver omap_drm_driver = { | |||
633 | .gem_vm_ops = &omap_gem_vm_ops, | 625 | .gem_vm_ops = &omap_gem_vm_ops, |
634 | .dumb_create = omap_gem_dumb_create, | 626 | .dumb_create = omap_gem_dumb_create, |
635 | .dumb_map_offset = omap_gem_dumb_map_offset, | 627 | .dumb_map_offset = omap_gem_dumb_map_offset, |
636 | .dumb_destroy = omap_gem_dumb_destroy, | 628 | .dumb_destroy = drm_gem_dumb_destroy, |
637 | .ioctls = ioctls, | 629 | .ioctls = ioctls, |
638 | .num_ioctls = DRM_OMAP_NUM_IOCTLS, | 630 | .num_ioctls = DRM_OMAP_NUM_IOCTLS, |
639 | .fops = &omapdriver_fops, | 631 | .fops = &omapdriver_fops, |