aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorRob Clark <rob@ti.com>2012-01-16 13:51:14 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-08 17:14:11 -0500
commitff4f38765d0e3bcc7d992d07cb27c37adb9b16ba (patch)
treea12833f20c388183dda8ab1f0f77cd604debc8f2 /drivers/staging
parentb7cdd9e6323af368e26121c5b791eddc78e79fea (diff)
staging: drm/omap: drm API update: make fops struct const
Update to reflect changes in: "Make the per-driver file_operations struct const" Signed-off-by: Rob Clark <rob@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/omapdrm/omap_drv.c24
1 files changed, 13 insertions, 11 deletions
diff --git a/drivers/staging/omapdrm/omap_drv.c b/drivers/staging/omapdrm/omap_drv.c
index 602aa2dd49c8..4db40f717b94 100644
--- a/drivers/staging/omapdrm/omap_drv.c
+++ b/drivers/staging/omapdrm/omap_drv.c
@@ -708,6 +708,18 @@ static struct vm_operations_struct omap_gem_vm_ops = {
708 .close = drm_gem_vm_close, 708 .close = drm_gem_vm_close,
709}; 709};
710 710
711static const struct file_operations omapdriver_fops = {
712 .owner = THIS_MODULE,
713 .open = drm_open,
714 .unlocked_ioctl = drm_ioctl,
715 .release = drm_release,
716 .mmap = omap_gem_mmap,
717 .poll = drm_poll,
718 .fasync = drm_fasync,
719 .read = drm_read,
720 .llseek = noop_llseek,
721};
722
711static struct drm_driver omap_drm_driver = { 723static struct drm_driver omap_drm_driver = {
712 .driver_features = 724 .driver_features =
713 DRIVER_HAVE_IRQ | DRIVER_MODESET | DRIVER_GEM, 725 DRIVER_HAVE_IRQ | DRIVER_MODESET | DRIVER_GEM,
@@ -738,17 +750,7 @@ static struct drm_driver omap_drm_driver = {
738 .dumb_destroy = omap_gem_dumb_destroy, 750 .dumb_destroy = omap_gem_dumb_destroy,
739 .ioctls = ioctls, 751 .ioctls = ioctls,
740 .num_ioctls = DRM_OMAP_NUM_IOCTLS, 752 .num_ioctls = DRM_OMAP_NUM_IOCTLS,
741 .fops = { 753 .fops = &omapdriver_fops,
742 .owner = THIS_MODULE,
743 .open = drm_open,
744 .unlocked_ioctl = drm_ioctl,
745 .release = drm_release,
746 .mmap = omap_gem_mmap,
747 .poll = drm_poll,
748 .fasync = drm_fasync,
749 .read = drm_read,
750 .llseek = noop_llseek,
751 },
752 .name = DRIVER_NAME, 754 .name = DRIVER_NAME,
753 .desc = DRIVER_DESC, 755 .desc = DRIVER_DESC,
754 .date = DRIVER_DATE, 756 .date = DRIVER_DATE,