Commit 2b46278b authored by Harvey Harrison's avatar Harvey Harrison Committed by Dave Airlie
Browse files

drm: radeon: fix sparse integer as NULL pointer warnings in radeon_mem.c



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: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 144a75fa
...@@ -88,7 +88,7 @@ static struct mem_block *alloc_block(struct mem_block *heap, int size, ...@@ -88,7 +88,7 @@ static struct mem_block *alloc_block(struct mem_block *heap, int size,
list_for_each(p, heap) { list_for_each(p, heap) {
int start = (p->start + mask) & ~mask; 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) ...@@ -113,7 +113,7 @@ static void free_block(struct mem_block *p)
/* Assumes a single contiguous range. Needs a special file_priv in /* Assumes a single contiguous range. Needs a special file_priv in
* 'heap' to stop it being subsumed. * 'heap' to stop it being subsumed.
*/ */
if (p->next->file_priv == 0) { if (p->next->file_priv == NULL) {
struct mem_block *q = p->next; struct mem_block *q = p->next;
p->size += q->size; p->size += q->size;
p->next = q->next; p->next = q->next;
...@@ -121,7 +121,7 @@ static void free_block(struct mem_block *p) ...@@ -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; struct mem_block *q = p->prev;
q->size += p->size; q->size += p->size;
q->next = p->next; q->next = p->next;
...@@ -174,7 +174,7 @@ void radeon_mem_release(struct drm_file *file_priv, struct mem_block *heap) ...@@ -174,7 +174,7 @@ void radeon_mem_release(struct drm_file *file_priv, struct mem_block *heap)
* 'heap' to stop it being subsumed. * 'heap' to stop it being subsumed.
*/ */
list_for_each(p, heap) { 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; struct mem_block *q = p->next;
p->size += q->size; p->size += q->size;
p->next = q->next; p->next = q->next;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment