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>
This commit is contained in:
Adrian Bunk 2006-08-16 11:55:18 +10:00 committed by Dave Airlie
parent c7aed17902
commit fb41e54be4
3 changed files with 10 additions and 7 deletions

View file

@ -65,8 +65,8 @@ static drm_map_list_t *drm_find_matching_map(drm_device_t *dev,
return NULL; return NULL;
} }
int drm_map_handle(drm_device_t *dev, drm_hash_item_t *hash, static int drm_map_handle(drm_device_t *dev, drm_hash_item_t *hash,
unsigned long user_token, int hashed_handle) unsigned long user_token, int hashed_handle)
{ {
int use_hashed_handle; int use_hashed_handle;
#if (BITS_PER_LONG == 64) #if (BITS_PER_LONG == 64)

View file

@ -114,7 +114,7 @@ static void drm_sman_mm_destroy(void *private)
drm_free(mm, sizeof(*mm), DRM_MEM_MM); drm_free(mm, sizeof(*mm), DRM_MEM_MM);
} }
unsigned long drm_sman_mm_offset(void *private, void *ref) static unsigned long drm_sman_mm_offset(void *private, void *ref)
{ {
drm_mm_node_t *node = (drm_mm_node_t *) ref; drm_mm_node_t *node = (drm_mm_node_t *) ref;
return node->start; return node->start;

View file

@ -40,8 +40,6 @@
#define VIDEO_TYPE 0 #define VIDEO_TYPE 0
#define AGP_TYPE 1 #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) #if defined(CONFIG_FB_SIS)
/* fb management via fb device */ /* 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); 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) static int sis_fb_init(DRM_IOCTL_ARGS)
{ {