diff options
| author | Adrian Bunk <bunk@stusta.de> | 2006-08-16 11:55:18 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-09-22 05:32:33 +1000 |
| commit | fb41e54be4bad6f64d343d051d699efde3c92e2c (patch) | |
| tree | d52f398bfbafe071e09a46c8637bd79c9a608753 | |
| parent | c7aed1790254aed286b7bfb51167c2676df86f4b (diff) | |
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>
| -rw-r--r-- | drivers/char/drm/drm_bufs.c | 4 | ||||
| -rw-r--r-- | drivers/char/drm/drm_sman.c | 2 | ||||
| -rw-r--r-- | drivers/char/drm/sis_mm.c | 11 |
3 files changed, 10 insertions, 7 deletions
diff --git a/drivers/char/drm/drm_bufs.c b/drivers/char/drm/drm_bufs.c index 71d2e091763..03c6db9029c 100644 --- a/drivers/char/drm/drm_bufs.c +++ b/drivers/char/drm/drm_bufs.c @@ -65,8 +65,8 @@ static drm_map_list_t *drm_find_matching_map(drm_device_t *dev, return NULL; } -int drm_map_handle(drm_device_t *dev, drm_hash_item_t *hash, - unsigned long user_token, int hashed_handle) +static int drm_map_handle(drm_device_t *dev, drm_hash_item_t *hash, + unsigned long user_token, int hashed_handle) { int use_hashed_handle; #if (BITS_PER_LONG == 64) diff --git a/drivers/char/drm/drm_sman.c b/drivers/char/drm/drm_sman.c index b92f0ee74b3..425c82336ee 100644 --- a/drivers/char/drm/drm_sman.c +++ b/drivers/char/drm/drm_sman.c @@ -114,7 +114,7 @@ static void drm_sman_mm_destroy(void *private) 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; return node->start; 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) { |