drm: cleanups

This patch contains the following cleanups:
- make 3 needlessly global functions static
- sis_mm.c: fix compile warnings with CONFIG_FB_SIS=y

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Dave Airlie <airlied@linux.ie>

1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/char/drm/sis_mm.c b/drivers/char/drm/sis_mm.c
index 1b21e324d04..d26f5dbb785 100644
--- 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)
 {