drm: lindent the drm directory.

I've been threatening this for a while, so no point hanging around.
This lindents the DRM code which was always really bad in tabbing department.
I've also fixed some misnamed files in comments and removed some trailing
whitespace.

Signed-off-by: Dave Airlie <airlied@linux.ie>

1 files changed, 70 insertions, 78 deletions

diff --git a/drivers/char/drm/radeon_mem.c b/drivers/char/drm/radeon_mem.c
index 134f894e6e4b..030a6fad0d86 100644
--- a/drivers/char/drm/radeon_mem.c
+++ b/drivers/char/drm/radeon_mem.c
@@ -1,7 +1,7 @@
 /* radeon_mem.c -- Simple GART/fb memory manager for radeon -*- linux-c -*-
  *
  * Copyright (C) The Weather Channel, Inc.  2002.  All Rights Reserved.
- * 
+ *
  * The Weather Channel (TM) funded Tungsten Graphics to develop the
  * initial release of the Radeon 8500 driver under the XFree86 license.
  * This notice must be preserved.
@@ -35,16 +35,17 @@
 #include "radeon_drv.h"
 
 /* Very simple allocator for GART memory, working on a static range
- * already mapped into each client's address space.  
+ * already mapped into each client's address space.
  */
 
 static struct mem_block *split_block(struct mem_block *p, int start, int size,
-                                     DRMFILE filp )
+                                     DRMFILE filp)
 {
         /* Maybe cut off the start of an existing block */
         if (start > p->start) {
-                struct mem_block *newblock = drm_alloc(sizeof(*newblock), DRM_MEM_BUFS );
-                if (!newblock) 
+                struct mem_block *newblock =
+                    drm_alloc(sizeof(*newblock), DRM_MEM_BUFS);
+                if (!newblock)
                         goto out;
                 newblock->start = start;
                 newblock->size = p->size - (start - p->start);
@@ -56,10 +57,11 @@ static struct mem_block *split_block(struct mem_block *p, int start, int size,
                 p->size -= newblock->size;
                 p = newblock;
         }
-   
+
         /* Maybe cut off the end of an existing block */
         if (size < p->size) {
-                struct mem_block *newblock = drm_alloc(sizeof(*newblock), DRM_MEM_BUFS );
+                struct mem_block *newblock =
+                    drm_alloc(sizeof(*newblock), DRM_MEM_BUFS);
                 if (!newblock)
                         goto out;
                 newblock->start = start + size;
@@ -72,40 +74,39 @@ static struct mem_block *split_block(struct mem_block *p, int start, int size,
                 p->size = size;
         }
 
- out:
+      out:
         /* Our block is in the middle */
         p->filp = filp;
         return p;
 }
 
-static struct mem_block *alloc_block( struct mem_block *heap, int size, 
-                                      int align2, DRMFILE filp )
+static struct mem_block *alloc_block(struct mem_block *heap, int size,
+                                     int align2, DRMFILE filp)
 {
         struct mem_block *p;
-        int mask = (1 << align2)-1;
+        int mask = (1 << align2) - 1;
 
         list_for_each(p, heap) {
                 int start = (p->start + mask) & ~mask;
                 if (p->filp == 0 && start + size <= p->start + p->size)
-                        return split_block( p, start, size, filp );
+                        return split_block(p, start, size, filp);
         }
 
         return NULL;
 }
 
-static struct mem_block *find_block( struct mem_block *heap, int start )
+static struct mem_block *find_block(struct mem_block *heap, int start)
 {
         struct mem_block *p;
 
         list_for_each(p, heap)
-                if (p->start == start)
-                        return p;
+            if (p->start == start)
+                return p;
 
         return NULL;
 }
 
-
-static void free_block( struct mem_block *p )
+static void free_block(struct mem_block *p)
 {
         p->filp = NULL;
 
@@ -117,7 +118,7 @@ static void free_block( struct mem_block *p )
                 p->size += q->size;
                 p->next = q->next;
                 p->next->prev = p;
-                drm_free(q, sizeof(*q), DRM_MEM_BUFS );
+                drm_free(q, sizeof(*q), DRM_MEM_BUFS);
         }
 
         if (p->prev->filp == 0) {
@@ -125,7 +126,7 @@ static void free_block( struct mem_block *p )
                 q->size += p->size;
                 q->next = p->next;
                 q->next->prev = q;
-                drm_free(p, sizeof(*q), DRM_MEM_BUFS );
+                drm_free(p, sizeof(*q), DRM_MEM_BUFS);
         }
 }
 
@@ -133,14 +134,14 @@ static void free_block( struct mem_block *p )
  */
 static int init_heap(struct mem_block **heap, int start, int size)
 {
-        struct mem_block *blocks = drm_alloc(sizeof(*blocks), DRM_MEM_BUFS );
+        struct mem_block *blocks = drm_alloc(sizeof(*blocks), DRM_MEM_BUFS);
 
-        if (!blocks) 
+        if (!blocks)
                 return DRM_ERR(ENOMEM);
-        
-        *heap = drm_alloc(sizeof(**heap), DRM_MEM_BUFS );
+
+        *heap = drm_alloc(sizeof(**heap), DRM_MEM_BUFS);
         if (!*heap) {
-                drm_free( blocks, sizeof(*blocks), DRM_MEM_BUFS );
+                drm_free(blocks, sizeof(*blocks), DRM_MEM_BUFS);
                 return DRM_ERR(ENOMEM);
         }
 
@@ -149,16 +150,15 @@ static int init_heap(struct mem_block **heap, int start, int size)
         blocks->filp = NULL;
         blocks->next = blocks->prev = *heap;
 
-        memset( *heap, 0, sizeof(**heap) );
-        (*heap)->filp = (DRMFILE) -1;
+        memset(*heap, 0, sizeof(**heap));
+        (*heap)->filp = (DRMFILE) - 1;
         (*heap)->next = (*heap)->prev = blocks;
         return 0;
 }
 
-
 /* Free all blocks associated with the releasing file.
  */
-void radeon_mem_release( DRMFILE filp, struct mem_block *heap )
+void radeon_mem_release(DRMFILE filp, struct mem_block *heap)
 {
         struct mem_block *p;
 
@@ -166,7 +166,7 @@ void radeon_mem_release( DRMFILE filp, struct mem_block *heap )
                 return;
 
         list_for_each(p, heap) {
-                if (p->filp == filp) 
+                if (p->filp == filp)
                         p->filp = NULL;
         }
 
@@ -179,40 +179,37 @@ void radeon_mem_release( DRMFILE filp, struct mem_block *heap )
                         p->size += q->size;
                         p->next = q->next;
                         p->next->prev = p;
-                        drm_free(q, sizeof(*q),DRM_MEM_DRIVER);
+                        drm_free(q, sizeof(*q), DRM_MEM_DRIVER);
                 }
         }
 }
 
 /* Shutdown.
  */
-void radeon_mem_takedown( struct mem_block **heap )
+void radeon_mem_takedown(struct mem_block **heap)
 {
         struct mem_block *p;
-        
+
         if (!*heap)
                 return;
 
-        for (p = (*heap)->next ; p != *heap ; ) {
+        for (p = (*heap)->next; p != *heap;) {
                 struct mem_block *q = p;
                 p = p->next;
-                drm_free(q, sizeof(*q),DRM_MEM_DRIVER);
+                drm_free(q, sizeof(*q), DRM_MEM_DRIVER);
         }
 
-        drm_free( *heap, sizeof(**heap),DRM_MEM_DRIVER );
+        drm_free(*heap, sizeof(**heap), DRM_MEM_DRIVER);
         *heap = NULL;
 }
 
-
-
 /* IOCTL HANDLERS */
 
-static struct mem_block **get_heap( drm_radeon_private_t *dev_priv,
-                                   int region )
+static struct mem_block **get_heap(drm_radeon_private_t * dev_priv, int region)
 {
-        switch( region ) {
+        switch (region) {
         case RADEON_MEM_REGION_GART:
-                return &dev_priv->gart_heap; 
+                return &dev_priv->gart_heap;
         case RADEON_MEM_REGION_FB:
                 return &dev_priv->fb_heap;
         default:
@@ -220,103 +217,98 @@ static struct mem_block **get_heap( drm_radeon_private_t *dev_priv,
         }
 }
 
-int radeon_mem_alloc( DRM_IOCTL_ARGS )
+int radeon_mem_alloc(DRM_IOCTL_ARGS)
 {
         DRM_DEVICE;
         drm_radeon_private_t *dev_priv = dev->dev_private;
         drm_radeon_mem_alloc_t alloc;
         struct mem_block *block, **heap;
 
-        if ( !dev_priv ) {
-                DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
+        if (!dev_priv) {
+                DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
                 return DRM_ERR(EINVAL);
         }
 
-        DRM_COPY_FROM_USER_IOCTL( alloc, (drm_radeon_mem_alloc_t __user *)data,
-                                  sizeof(alloc) );
+        DRM_COPY_FROM_USER_IOCTL(alloc, (drm_radeon_mem_alloc_t __user *) data,
+                                 sizeof(alloc));
 
-        heap = get_heap( dev_priv, alloc.region );
+        heap = get_heap(dev_priv, alloc.region);
         if (!heap || !*heap)
                 return DRM_ERR(EFAULT);
-        
+
         /* Make things easier on ourselves: all allocations at least
          * 4k aligned.
          */
         if (alloc.alignment < 12)
                 alloc.alignment = 12;
 
-        block = alloc_block( *heap, alloc.size, alloc.alignment,
-                             filp );
+        block = alloc_block(*heap, alloc.size, alloc.alignment, filp);
 
-        if (!block) 
+        if (!block)
                 return DRM_ERR(ENOMEM);
 
-        if ( DRM_COPY_TO_USER( alloc.region_offset, &block->start, 
-                               sizeof(int) ) ) {
-                DRM_ERROR( "copy_to_user\n" );
+        if (DRM_COPY_TO_USER(alloc.region_offset, &block->start, sizeof(int))) {
+                DRM_ERROR("copy_to_user\n");
                 return DRM_ERR(EFAULT);
         }
-        
+
         return 0;
 }
 
-
-
-int radeon_mem_free( DRM_IOCTL_ARGS )
+int radeon_mem_free(DRM_IOCTL_ARGS)
 {
         DRM_DEVICE;
         drm_radeon_private_t *dev_priv = dev->dev_private;
         drm_radeon_mem_free_t memfree;
         struct mem_block *block, **heap;
 
-        if ( !dev_priv ) {
-                DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
+        if (!dev_priv) {
+                DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
                 return DRM_ERR(EINVAL);
         }
 
-        DRM_COPY_FROM_USER_IOCTL( memfree, (drm_radeon_mem_free_t __user *)data,
-                                  sizeof(memfree) );
+        DRM_COPY_FROM_USER_IOCTL(memfree, (drm_radeon_mem_free_t __user *) data,
+                                 sizeof(memfree));
 
-        heap = get_heap( dev_priv, memfree.region );
+        heap = get_heap(dev_priv, memfree.region);
         if (!heap || !*heap)
                 return DRM_ERR(EFAULT);
-        
-        block = find_block( *heap, memfree.region_offset );
+
+        block = find_block(*heap, memfree.region_offset);
         if (!block)
                 return DRM_ERR(EFAULT);
 
         if (block->filp != filp)
                 return DRM_ERR(EPERM);
 
-        free_block( block );    
+        free_block(block);
         return 0;
 }
 
-int radeon_mem_init_heap( DRM_IOCTL_ARGS )
+int radeon_mem_init_heap(DRM_IOCTL_ARGS)
 {
         DRM_DEVICE;
         drm_radeon_private_t *dev_priv = dev->dev_private;
         drm_radeon_mem_init_heap_t initheap;
         struct mem_block **heap;
 
-        if ( !dev_priv ) {
-                DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
+        if (!dev_priv) {
+                DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
                 return DRM_ERR(EINVAL);
         }
 
-        DRM_COPY_FROM_USER_IOCTL( initheap, (drm_radeon_mem_init_heap_t __user *)data,
-                                  sizeof(initheap) );
+        DRM_COPY_FROM_USER_IOCTL(initheap,
+                                 (drm_radeon_mem_init_heap_t __user *) data,
+                                 sizeof(initheap));
 
-        heap = get_heap( dev_priv, initheap.region );
-        if (!heap) 
+        heap = get_heap(dev_priv, initheap.region);
+        if (!heap)
                 return DRM_ERR(EFAULT);
-        
+
         if (*heap) {
                 DRM_ERROR("heap already initialized?");
                 return DRM_ERR(EFAULT);
         }
-                
-        return init_heap( heap, initheap.start, initheap.size );
-}
-
 
+        return init_heap(heap, initheap.start, initheap.size);
+}