1 files changed, 14 insertions, 34 deletions

diff --git a/drivers/char/drm/r128_drv.c b/drivers/char/drm/r128_drv.c
index 1661e7351402..e20450ae220e 100644
--- a/drivers/char/drm/r128_drv.c
+++ b/drivers/char/drm/r128_drv.c
@@ -37,31 +37,6 @@
 
 #include "drm_pciids.h"
 
-static int postinit(struct drm_device *dev, unsigned long flags)
-{
-        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[] = {
         r128_PCI_IDS
 };
@@ -72,8 +47,8 @@ static struct drm_driver driver = {
             DRIVER_HAVE_DMA | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED |
             DRIVER_IRQ_VBL,
         .dev_priv_size = sizeof(drm_r128_buf_priv_t),
-        .prerelease = r128_driver_prerelease,
-        .pretakedown = r128_driver_pretakedown,
+        .preclose = r128_driver_preclose,
+        .lastclose = r128_driver_lastclose,
         .vblank_wait = r128_driver_vblank_wait,
         .irq_preinstall = r128_driver_irq_preinstall,
         .irq_postinstall = r128_driver_irq_postinstall,
@@ -82,8 +57,6 @@ static struct drm_driver driver = {
         .reclaim_buffers = drm_core_reclaim_buffers,
         .get_map_ofs = drm_core_get_map_ofs,
         .get_reg_ofs = drm_core_get_reg_ofs,
-        .postinit = postinit,
-        .version = version,
         .ioctls = r128_ioctls,
         .dma_ioctl = r128_cce_buffers,
         .fops = {
@@ -97,12 +70,19 @@ static struct drm_driver driver = {
 #ifdef CONFIG_COMPAT
                  .compat_ioctl = r128_compat_ioctl,
 #endif
-                 }
-        ,
+        },
+
         .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 r128_init(void)