From a1d0fcf5a1cf56ae4711c7e0f857832724a67e8b Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Mon, 14 Aug 2006 11:35:15 +1000 Subject: drm: remove FALSE/TRUE that snuck in with simple memory manager changes. Thanks to Andrew Morton for pointing these out, I've fixed a few his patch missed. Signed-off-by: Andrew Morton Signed-off-by: Dave Airlie --- drivers/char/drm/sis_mm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'drivers/char/drm/sis_mm.c') diff --git a/drivers/char/drm/sis_mm.c b/drivers/char/drm/sis_mm.c index 3041c5b42d56..1b21e324d04e 100644 --- a/drivers/char/drm/sis_mm.c +++ b/drivers/char/drm/sis_mm.c @@ -111,7 +111,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); @@ -133,7 +133,7 @@ static int sis_drm_alloc(drm_device_t * dev, drm_file_t * priv, mutex_lock(&dev->struct_mutex); - if (FALSE == ((pool == 0) ? dev_priv->vram_initialized : + if (0 == ((pool == 0) ? dev_priv->vram_initialized : dev_priv->agp_initialized)) { DRM_ERROR ("Attempt to allocate from uninitialized memory manager.\n"); @@ -211,7 +211,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); @@ -284,7 +284,7 @@ int 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; } /* @@ -305,8 +305,8 @@ void sis_lastclose(struct drm_device *dev) mutex_lock(&dev->struct_mutex); drm_sman_cleanup(&dev_priv->sman); - dev_priv->vram_initialized = FALSE; - dev_priv->agp_initialized = FALSE; + dev_priv->vram_initialized = 0; + dev_priv->agp_initialized = 0; dev_priv->mmio = NULL; mutex_unlock(&dev->struct_mutex); } -- cgit v1.2.1