drm: cleanups

[powerpc.git] / drivers / char / drm / sis_mm.c

diff --git a/drivers/char/drm/sis_mm.c b/drivers/char/drm/sis_mm.c
index 3041c5b..d26f5db 100644 (file)
--- a/drivers/char/drm/sis_mm.c
+++ b/drivers/char/drm/sis_mm.c
@@ -40,8 +40,6 @@
 #define VIDEO_TYPE 0
 #define AGP_TYPE 1
 
-#define SIS_MM_ALIGN_SHIFT 4
-#define SIS_MM_ALIGN_MASK ( (1 << SIS_MM_ALIGN_SHIFT) - 1)
 
 #if defined(CONFIG_FB_SIS)
 /* fb management via fb device */
@@ -72,12 +70,17 @@ static void sis_sman_mm_destroy(void *private)
        ;
 }
 
-unsigned long sis_sman_mm_offset(void *private, void *ref)
+static unsigned long sis_sman_mm_offset(void *private, void *ref)
 {
        return ~((unsigned long)ref);
 }
 
-#endif
+#else /* CONFIG_FB_SIS */
+
+#define SIS_MM_ALIGN_SHIFT 4
+#define SIS_MM_ALIGN_MASK ( (1 << SIS_MM_ALIGN_SHIFT) - 1)
+
+#endif /* CONFIG_FB_SIS */
 
 static int sis_fb_init(DRM_IOCTL_ARGS)
 {
@@ -111,7 +114,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 +136,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 +214,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 +287,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 +308,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);
 }