1 files changed, 38 insertions, 42 deletions

diff --git a/drivers/char/drm/mga_drv.c b/drivers/char/drm/mga_drv.c
index daabbba3b297..0cc7c305a7f6 100644
--- a/drivers/char/drm/mga_drv.c
+++ b/drivers/char/drm/mga_drv.c
@@ -35,14 +35,13 @@
 #include "mga_drm.h"
 #include "mga_drv.h"
 
-  
 #include "drm_pciids.h"
 
 static int mga_driver_device_is_agp(drm_device_t * dev);
-static int postinit( struct drm_device *dev, unsigned long flags )
+static int postinit(struct drm_device *dev, unsigned long flags)
 {
-        drm_mga_private_t * const dev_priv =
-                (drm_mga_private_t *) dev->dev_private;
+        drm_mga_private_t *const dev_priv =
+            (drm_mga_private_t *) dev->dev_private;
 
         dev_priv->mmio_base = pci_resource_start(dev->pdev, 1);
         dev_priv->mmio_size = pci_resource_len(dev->pdev, 1);
@@ -52,28 +51,26 @@ static int postinit( struct drm_device *dev, unsigned long flags )
         dev->types[7] = _DRM_STAT_PRIMARY;
         dev->types[8] = _DRM_STAT_SECONDARY;
 
-        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)
-                );
+        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 )
+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 );
+        DRM_COPY(version->name, DRIVER_NAME);
+        DRM_COPY(version->date, DRIVER_DATE);
+        DRM_COPY(version->desc, DRIVER_DESC);
         return 0;
 }
 
@@ -81,11 +78,11 @@ static struct pci_device_id pciidlist[] = {
         mga_PCI_IDS
 };
 
-extern drm_ioctl_desc_t mga_ioctls[];
-extern int mga_max_ioctl;
-
 static struct drm_driver driver = {
-        .driver_features = DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | DRIVER_USE_MTRR | DRIVER_HAVE_DMA | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_IRQ_VBL,
+        .driver_features =
+            DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | DRIVER_USE_MTRR |
+            DRIVER_HAVE_DMA | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED |
+            DRIVER_IRQ_VBL,
         .preinit = mga_driver_preinit,
         .postcleanup = mga_driver_postcleanup,
         .pretakedown = mga_driver_pretakedown,
@@ -104,21 +101,21 @@ static struct drm_driver driver = {
         .ioctls = mga_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,
+                 .owner = THIS_MODULE,
+                 .open = drm_open,
+                 .release = drm_release,
+                 .ioctl = drm_ioctl,
+                 .mmap = drm_mmap,
+                 .poll = drm_poll,
+                 .fasync = drm_fasync,
 #ifdef CONFIG_COMPAT
-                .compat_ioctl = mga_compat_ioctl,
+                 .compat_ioctl = mga_compat_ioctl,
 #endif
-        },
+                 },
         .pci_driver = {
-                .name = DRIVER_NAME,
-                .id_table = pciidlist,
-        }
+                       .name = DRIVER_NAME,
+                       .id_table = pciidlist,
+                       }
 };
 
 static int __init mga_init(void)
@@ -135,8 +132,8 @@ static void __exit mga_exit(void)
 module_init(mga_init);
 module_exit(mga_exit);
 
-MODULE_AUTHOR( DRIVER_AUTHOR );
-MODULE_DESCRIPTION( DRIVER_DESC );
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL and additional rights");
 
 /**
@@ -151,10 +148,9 @@ MODULE_LICENSE("GPL and additional rights");
  * \returns
  * If the device is a PCI G450, zero is returned.  Otherwise 2 is returned.
  */
-int mga_driver_device_is_agp(drm_device_t * dev)
+static int mga_driver_device_is_agp(drm_device_t * dev)
 {
-        const struct pci_dev * const pdev = dev->pdev;
-
+        const struct pci_dev *const pdev = dev->pdev;
 
         /* There are PCI versions of the G450.  These cards have the
          * same PCI ID as the AGP G450, but have an additional PCI-to-PCI
@@ -164,10 +160,10 @@ int mga_driver_device_is_agp(drm_device_t * dev)
          * device is 0x0021 (HB6 Universal PCI-PCI bridge), we reject the
          * device.
          */
-        
-        if ( (pdev->device == 0x0525)
-             && (pdev->bus->self->vendor == 0x3388)
-             && (pdev->bus->self->device == 0x0021) ) {
+
+        if ((pdev->device == 0x0525)
+            && (pdev->bus->self->vendor == 0x3388)
+            && (pdev->bus->self->device == 0x0021)) {
                 return 0;
         }