1 files changed, 15 insertions, 41 deletions

diff --git a/drivers/char/drm/i830_drv.c b/drivers/char/drm/i830_drv.c
index acd821e8fe4d..49fd2816de95 100644
--- a/drivers/char/drm/i830_drv.c
+++ b/drivers/char/drm/i830_drv.c
@@ -40,37 +40,6 @@
 
 #include "drm_pciids.h"
 
-static int postinit(struct drm_device *dev, unsigned long flags)
-{
-        dev->counters += 4;
-        dev->types[6] = _DRM_STAT_IRQ;
-        dev->types[7] = _DRM_STAT_PRIMARY;
-        dev->types[8] = _DRM_STAT_SECONDARY;
-        dev->types[9] = _DRM_STAT_DMA;
-
-        DRM_INFO("Initialized %s %d.%d.%d %s on minor %d: %s\n",
-                 DRIVER_NAME,
-                 DRIVER_MAJOR,
-                 DRIVER_MINOR,
-                 DRIVER_PATCHLEVEL,
-                 DRIVER_DATE, dev->primary.minor, pci_pretty_name(dev->pdev)
-            );
-        return 0;
-}
-
-static int version(drm_version_t * version)
-{
-        int len;
-
-        version->version_major = DRIVER_MAJOR;
-        version->version_minor = DRIVER_MINOR;
-        version->version_patchlevel = DRIVER_PATCHLEVEL;
-        DRM_COPY(version->name, DRIVER_NAME);
-        DRM_COPY(version->date, DRIVER_DATE);
-        DRM_COPY(version->desc, DRIVER_DESC);
-        return 0;
-}
-
 static struct pci_device_id pciidlist[] = {
         i830_PCI_IDS
 };
@@ -83,10 +52,11 @@ static struct drm_driver driver = {
         .driver_features |= DRIVER_HAVE_IRQ | DRIVER_SHARED_IRQ,
 #endif
         .dev_priv_size = sizeof(drm_i830_buf_priv_t),
-        .pretakedown = i830_driver_pretakedown,
-        .prerelease = i830_driver_prerelease,
+        .load = i830_driver_load,
+        .lastclose = i830_driver_lastclose,
+        .preclose = i830_driver_preclose,
         .device_is_agp = i830_driver_device_is_agp,
-        .release = i830_driver_release,
+        .reclaim_buffers_locked = i830_driver_reclaim_buffers_locked,
         .dma_quiescent = i830_driver_dma_quiescent,
         .reclaim_buffers = i830_reclaim_buffers,
         .get_map_ofs = drm_core_get_map_ofs,
@@ -97,8 +67,6 @@ static struct drm_driver driver = {
         .irq_uninstall = i830_driver_irq_uninstall,
         .irq_handler = i830_driver_irq_handler,
 #endif
-        .postinit = postinit,
-        .version = version,
         .ioctls = i830_ioctls,
         .fops = {
                  .owner = THIS_MODULE,
@@ -108,13 +76,19 @@ static struct drm_driver driver = {
                  .mmap = drm_mmap,
                  .poll = drm_poll,
                  .fasync = drm_fasync,
-                 }
-        ,
+        },
+
         .pci_driver = {
-                       .name = DRIVER_NAME,
-                       .id_table = pciidlist,
-                       }
+                 .name = DRIVER_NAME,
+                 .id_table = pciidlist,
+        },
 
+        .name = DRIVER_NAME,
+        .desc = DRIVER_DESC,
+        .date = DRIVER_DATE,
+        .major = DRIVER_MAJOR,
+        .minor = DRIVER_MINOR,
+        .patchlevel = DRIVER_PATCHLEVEL,
 };
 
 static int __init i830_init(void)