remove all TRUE instances as well
authorDave Airlie <airlied@linux.ie>
Mon, 14 Aug 2006 01:52:34 +0000 (11:52 +1000)
committerDave Airlie <airlied@linux.ie>
Mon, 14 Aug 2006 01:52:34 +0000 (11:52 +1000)
linux-core/drm_mm.c
linux-core/drm_sman.c
linux-core/drm_sman.h
linux-core/sis_mm.c
linux-core/via_mm.c

index 8d95cd4..617526b 100644 (file)
@@ -95,7 +95,7 @@ void drm_mm_put_block(drm_mm_t * mm, drm_mm_node_t * cur)
                prev_node = list_entry(cur_head->prev, drm_mm_node_t, ml_entry);
                if (prev_node->free) {
                        prev_node->size += cur->size;
-                       merged = TRUE;
+                       merged = 1;
                }
        }
        if (cur_head->next != root_head) {
@@ -110,12 +110,12 @@ void drm_mm_put_block(drm_mm_t * mm, drm_mm_node_t * cur)
                        } else {
                                next_node->size += cur->size;
                                next_node->start = cur->start;
-                               merged = TRUE;
+                               merged = 1;
                        }
                }
        }
        if (!merged) {
-               cur->free = TRUE;
+               cur->free = 1;
                list_add(&cur->fl_entry, &list_root->fl_entry);
        } else {
                list_del(&cur->ml_entry);
@@ -169,7 +169,7 @@ int drm_mm_init(drm_mm_t * mm, unsigned long start, unsigned long size)
 
        child->start = start;
        child->size = size;
-       child->free = TRUE;
+       child->free = 1;
 
        list_add(&child->fl_entry, &mm->root_node.fl_entry);
        list_add(&child->ml_entry, &mm->root_node.ml_entry);
index baba913..b92f0ee 100644 (file)
@@ -91,7 +91,7 @@ static void *drm_sman_mm_allocate(void *private, unsigned long size,
        drm_mm_t *mm = (drm_mm_t *) private;
        drm_mm_node_t *tmp;
 
-       tmp = drm_mm_search_free(mm, size, alignment, TRUE);
+       tmp = drm_mm_search_free(mm, size, alignment, 1);
        if (!tmp) {
                return NULL;
        }
index 7c48360..ddc732a 100644 (file)
@@ -148,7 +148,7 @@ extern drm_memblock_item_t *drm_sman_alloc(drm_sman_t * sman,
 extern int drm_sman_free_key(drm_sman_t * sman, unsigned int key);
 
 /*
- * returns TRUE iff there are no stale memory blocks associated with this owner.
+ * returns 1 iff there are no stale memory blocks associated with this owner.
  * Typically called to determine if we need to idle the hardware and call
  * drm_sman_owner_cleanup. If there are no stale memory blocks, it removes all
  * resources associated with owner.
index c321c09..eca535f 100644 (file)
@@ -117,7 +117,7 @@ static int sis_fb_init(DRM_IOCTL_ARGS)
                return ret;
        }
 
-       dev_priv->vram_initialized = TRUE;
+       dev_priv->vram_initialized = 1;
        dev_priv->vram_offset = fb.offset;
 
        mutex_unlock(&dev->struct_mutex);
@@ -217,7 +217,7 @@ static int sis_ioctl_agp_init(DRM_IOCTL_ARGS)
                return ret;
        }
 
-       dev_priv->agp_initialized = TRUE;
+       dev_priv->agp_initialized = 1;
        dev_priv->agp_offset = agp.offset;
        mutex_unlock(&dev->struct_mutex);
 
@@ -291,7 +291,7 @@ sis_idle(drm_device_t *dev)
        if (time_after_eq(jiffies, end)) {
                DRM_ERROR("Graphics engine idle timeout. "
                          "Disabling idle check\n");
-               dev_priv->idle_fault = TRUE;
+               dev_priv->idle_fault = 1;
        }
 
        /*
index 3195c06..d97269f 100644 (file)
@@ -52,7 +52,7 @@ int via_agp_init(DRM_IOCTL_ARGS)
                return ret;
        }
 
-       dev_priv->agp_initialized = TRUE;
+       dev_priv->agp_initialized = 1;
        dev_priv->agp_offset = agp.offset;
        mutex_unlock(&dev->struct_mutex);
 
@@ -79,7 +79,7 @@ int via_fb_init(DRM_IOCTL_ARGS)
                return ret;
        }
 
-       dev_priv->vram_initialized = TRUE;
+       dev_priv->vram_initialized = 1;
        dev_priv->vram_offset = fb.offset;
 
        mutex_unlock(&dev->struct_mutex);