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:
parent
c7aed17902
commit
fb41e54be4
|
@ -65,7 +65,7 @@ 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;
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue