drm: move fops into drivers

move the drm file operations into the driver.

From: Jon Smirl <jonsmirl@gmail.com>
Approved-by: Dave Airlie <airlied@linux.ie>

drivers/char/drm/drmP.h

@@ -587,6 +587,7 @@ struct drm_driver {
 	int dev_priv_size;
 	drm_ioctl_desc_t *ioctls;
 	int num_ioctls;
+	struct file_operations fops;
 	struct pci_driver pci_driver;
 };
 /**
@@ -715,9 +716,6 @@ typedef struct drm_device {
 	drm_sigdata_t     sigdata; /**< For block_all_signals */
 	sigset_t          sigmask;
 
-	struct file_operations *fops;	/**< file operations */
-	struct proc_dir_entry  *dev_root; /**< proc directory entry */
-
 	struct            drm_driver *driver;
 	drm_local_map_t   *agp_buffer_map;
 } drm_device_t;

drivers/char/drm/drm_drv.c

@@ -55,18 +55,6 @@
 #include "drmP.h"
 #include "drm_core.h"
 
-struct file_operations	drm_fops = {
-	.owner   = THIS_MODULE,
-	.open	 = drm_open,
-	.flush	 = drm_flush,
-	.release = drm_release,
-	.ioctl	 = drm_ioctl,
-	.mmap	 = drm_mmap,
-	.fasync  = drm_fasync,
-	.poll	 = drm_poll,
-	.read	 = drm_read,
-};
-
 /** Ioctl table */
 drm_ioctl_desc_t		  drm_ioctls[] = {
 	[DRM_IOCTL_NR(DRM_IOCTL_VERSION)]       = { drm_version,     0, 0 },
@@ -382,7 +370,6 @@ int drm_fill_in_dev(drm_device_t *dev, struct pci_dev *pdev, const struct pci_de
 	sema_init( &dev->struct_sem, 1 );
 	sema_init( &dev->ctxlist_sem, 1 );
 
-	dev->fops   = &drm_fops;
 	dev->pdev   = pdev;
 
 #ifdef __alpha__

drivers/char/drm/drm_fops.c

@@ -149,6 +149,7 @@ unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait)
 {
 	return 0;
 }
+EXPORT_SYMBOL(drm_poll);
 
 
 /** No-op. */

drivers/char/drm/drm_stub.c

@@ -79,7 +79,7 @@ static int stub_open(struct inode *inode, struct file *filp)
 		return -ENODEV;
 
 	old_fops = filp->f_op;
-	filp->f_op = fops_get(dev->fops);
+	filp->f_op = fops_get(&dev->driver->fops);
 	if (filp->f_op->open && (err = filp->f_op->open(inode, filp))) {
 		fops_put(filp->f_op);
 		filp->f_op = fops_get(old_fops);

drivers/char/drm/drm_vm.c

@@ -667,3 +667,4 @@ int drm_mmap(struct file *filp, struct vm_area_struct *vma)
 	drm_vm_open(vma);
 	return 0;
 }
+EXPORT_SYMBOL(drm_mmap);

drivers/char/drm/i810_drv.c

@@ -107,6 +107,15 @@ static struct drm_driver driver = {
 	.version = version,
 	.ioctls = ioctls,
 	.num_ioctls = DRM_ARRAY_SIZE(ioctls),
+	.fops = {
+		.owner = THIS_MODULE,
+		.open = drm_open,
+		.release = drm_release,
+		.ioctl = drm_ioctl,
+		.mmap = i810_mmap_buffers,
+		.poll = drm_poll,
+		.fasync = drm_fasync,
+	},
 	.pci_driver = {
 		.name          = DRIVER_NAME,
 		.id_table      = pciidlist,

drivers/char/drm/i830_drv.c

@@ -116,6 +116,15 @@ static struct drm_driver driver = {
 	.version = version,
 	.ioctls = ioctls,
 	.num_ioctls = DRM_ARRAY_SIZE(ioctls),
+	.fops = {
+		.owner = THIS_MODULE,
+		.open = drm_open,
+		.release = drm_release,
+		.ioctl = drm_ioctl,
+		.mmap = i830_mmap_buffers,
+		.poll = drm_poll,
+		.fasync = drm_fasync,
+	},
 	.pci_driver = {
 		.name          = DRIVER_NAME,
 		.id_table      = pciidlist,

drivers/char/drm/i915_drv.c

@@ -83,6 +83,15 @@ static struct drm_driver driver = {
 	.version = version,
 	.ioctls = ioctls,
 	.num_ioctls = DRM_ARRAY_SIZE(ioctls),
+	.fops = {
+		.owner = THIS_MODULE,
+		.open = drm_open,
+		.release = drm_release,
+		.ioctl = drm_ioctl,
+		.mmap = drm_mmap,
+		.poll = drm_poll,
+		.fasync = drm_fasync,
+	},
 	.pci_driver = {
 		.name          = DRIVER_NAME,
 		.id_table      = pciidlist,

drivers/char/drm/mga_drv.c

@@ -104,6 +104,15 @@ static struct drm_driver driver = {
 	.ioctls = ioctls,
 	.num_ioctls = DRM_ARRAY_SIZE(ioctls),
 	.dma_ioctl = mga_dma_buffers,
+	.fops = {
+		.owner = THIS_MODULE,
+		.open = drm_open,
+		.release = drm_release,
+		.ioctl = drm_ioctl,
+		.mmap = drm_mmap,
+		.poll = drm_poll,
+		.fasync = drm_fasync,
+	},
 	.pci_driver = {
 		.name = DRIVER_NAME,
 		.id_table = pciidlist,

drivers/char/drm/r128_drv.c

@@ -113,6 +113,15 @@ static struct drm_driver driver = {
 	.ioctls = ioctls,
 	.num_ioctls = DRM_ARRAY_SIZE(ioctls),
 	.dma_ioctl = r128_cce_buffers,
+	.fops = {
+		.owner = THIS_MODULE,
+		.open = drm_open,
+		.release = drm_release,
+		.ioctl = drm_ioctl,
+		.mmap = drm_mmap,
+		.poll = drm_poll,
+		.fasync = drm_fasync,
+	},
 	.pci_driver = {
 		.name          = DRIVER_NAME,
 		.id_table      = pciidlist,

drivers/char/drm/radeon_drv.c

@@ -151,6 +151,15 @@ static struct drm_driver driver = {
 	.ioctls = ioctls,
 	.num_ioctls = DRM_ARRAY_SIZE(ioctls),
 	.dma_ioctl = radeon_cp_buffers,
+	.fops = {
+		.owner = THIS_MODULE,
+		.open = drm_open,
+		.release = drm_release,
+		.ioctl = drm_ioctl,
+		.mmap = drm_mmap,
+		.poll = drm_poll,
+		.fasync = drm_fasync,
+	},
 	.pci_driver = {
 		.name          = DRIVER_NAME,
 		.id_table      = pciidlist,

drivers/char/drm/sis_drv.c

@@ -83,6 +83,15 @@ static struct drm_driver driver = {
 	.version = version,
 	.ioctls = ioctls,
 	.num_ioctls = DRM_ARRAY_SIZE(ioctls),
+	.fops = {
+		.owner = THIS_MODULE,
+		.open = drm_open,
+		.release = drm_release,
+		.ioctl = drm_ioctl,
+		.mmap = drm_mmap,
+		.poll = drm_poll,
+		.fasync = drm_fasync,
+	},
 	.pci_driver = {
 		.name          = DRIVER_NAME,
 		.id_table      = pciidlist,

drivers/char/drm/tdfx_drv.c

@@ -74,6 +74,15 @@ static struct drm_driver driver = {
 	.get_reg_ofs = drm_core_get_reg_ofs,
 	.postinit = postinit,
 	.version = version,
+	.fops = {
+		.owner = THIS_MODULE,
+		.open = drm_open,
+		.release = drm_release,
+		.ioctl = drm_ioctl,
+		.mmap = drm_mmap,
+		.poll = drm_poll,
+		.fasync = drm_fasync,
+	},
 	.pci_driver = {
 		.name          = DRIVER_NAME,
 		.id_table      = pciidlist,