drm: radeon: fix sparse integer as NULL pointer warnings in radeon_mem.c
authorHarvey Harrison <harvey.harrison@gmail.com>
Fri, 28 Mar 2008 21:23:06 +0000 (14:23 -0700)
committerDave Airlie <airlied@linux.ie>
Sat, 29 Mar 2008 21:56:39 +0000 (07:56 +1000)
drivers/char/drm/radeon_mem.c:91:23: warning: Using plain integer as NULL pointer
drivers/char/drm/radeon_mem.c:116:28: warning: Using plain integer as NULL pointer
drivers/char/drm/radeon_mem.c:124:28: warning: Using plain integer as NULL pointer
drivers/char/drm/radeon_mem.c:177:26: warning: Using plain integer as NULL pointer
drivers/char/drm/radeon_mem.c:177:53: warning: Using plain integer as NULL pointer

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dave Airlie <airlied@linux.ie>
drivers/char/drm/radeon_mem.c

index 78b34fa7c89a913e0cd5df3e021e65d713fe3f29..4af5286a36fb2276b1c524e5d2dd196fdad08918 100644 (file)
@@ -88,7 +88,7 @@ static struct mem_block *alloc_block(struct mem_block *heap, int size,
 
        list_for_each(p, heap) {
                int start = (p->start + mask) & ~mask;
 
        list_for_each(p, heap) {
                int start = (p->start + mask) & ~mask;
-               if (p->file_priv == 0 && start + size <= p->start + p->size)
+               if (p->file_priv == NULL && start + size <= p->start + p->size)
                        return split_block(p, start, size, file_priv);
        }
 
                        return split_block(p, start, size, file_priv);
        }
 
@@ -113,7 +113,7 @@ static void free_block(struct mem_block *p)
        /* Assumes a single contiguous range.  Needs a special file_priv in
         * 'heap' to stop it being subsumed.
         */
        /* Assumes a single contiguous range.  Needs a special file_priv in
         * 'heap' to stop it being subsumed.
         */
-       if (p->next->file_priv == 0) {
+       if (p->next->file_priv == NULL) {
                struct mem_block *q = p->next;
                p->size += q->size;
                p->next = q->next;
                struct mem_block *q = p->next;
                p->size += q->size;
                p->next = q->next;
@@ -121,7 +121,7 @@ static void free_block(struct mem_block *p)
                drm_free(q, sizeof(*q), DRM_MEM_BUFS);
        }
 
                drm_free(q, sizeof(*q), DRM_MEM_BUFS);
        }
 
-       if (p->prev->file_priv == 0) {
+       if (p->prev->file_priv == NULL) {
                struct mem_block *q = p->prev;
                q->size += p->size;
                q->next = p->next;
                struct mem_block *q = p->prev;
                q->size += p->size;
                q->next = p->next;
@@ -174,7 +174,7 @@ void radeon_mem_release(struct drm_file *file_priv, struct mem_block *heap)
         * 'heap' to stop it being subsumed.
         */
        list_for_each(p, heap) {
         * 'heap' to stop it being subsumed.
         */
        list_for_each(p, heap) {
-               while (p->file_priv == 0 && p->next->file_priv == 0) {
+               while (p->file_priv == NULL && p->next->file_priv == NULL) {
                        struct mem_block *q = p->next;
                        p->size += q->size;
                        p->next = q->next;
                        struct mem_block *q = p->next;
                        p->size += q->size;
                        p->next = q->next;