diff options
author | Adrian Bunk <bunk@stusta.de> | 2006-10-03 04:15:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 11:04:12 -0400 |
commit | 9c5b39e0bcb407a95716de4650a2d1e6064baffa (patch) | |
tree | 6689136b2a72a4ff0bdca2f680b313bb0e109e26 /drivers/video | |
parent | fe27e67616e300f2c891a669ea3b0e29f1e3bead (diff) |
[PATCH] atyfb: Possible cleanups
- make the following needlessly global function static:
- mach64_ct.c: aty_st_pll_ct()
- proper prototypes for the following functions:
- atyfb_base.c: atyfb_copyarea()
- atyfb_base.c: atyfb_fillrect()
- atyfb_base.c: atyfb_imageblit()
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/aty/atyfb.h | 6 | ||||
-rw-r--r-- | drivers/video/aty/atyfb_base.c | 3 | ||||
-rw-r--r-- | drivers/video/aty/mach64_ct.c | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/drivers/video/aty/atyfb.h b/drivers/video/aty/atyfb.h index 55fb8b04489b..b04f49fb976a 100644 --- a/drivers/video/aty/atyfb.h +++ b/drivers/video/aty/atyfb.h | |||
@@ -355,5 +355,9 @@ static inline void wait_for_idle(struct atyfb_par *par) | |||
355 | 355 | ||
356 | extern void aty_reset_engine(const struct atyfb_par *par); | 356 | extern void aty_reset_engine(const struct atyfb_par *par); |
357 | extern void aty_init_engine(struct atyfb_par *par, struct fb_info *info); | 357 | extern void aty_init_engine(struct atyfb_par *par, struct fb_info *info); |
358 | extern void aty_st_pll_ct(int offset, u8 val, const struct atyfb_par *par); | ||
359 | extern u8 aty_ld_pll_ct(int offset, const struct atyfb_par *par); | 358 | extern u8 aty_ld_pll_ct(int offset, const struct atyfb_par *par); |
359 | |||
360 | void atyfb_copyarea(struct fb_info *info, const struct fb_copyarea *area); | ||
361 | void atyfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect); | ||
362 | void atyfb_imageblit(struct fb_info *info, const struct fb_image *image); | ||
363 | |||
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index 1e8e9ade9396..b45c9fd1b330 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c | |||
@@ -240,9 +240,6 @@ static int atyfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, | |||
240 | static int atyfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info); | 240 | static int atyfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info); |
241 | static int atyfb_blank(int blank, struct fb_info *info); | 241 | static int atyfb_blank(int blank, struct fb_info *info); |
242 | static int atyfb_ioctl(struct fb_info *info, u_int cmd, u_long arg); | 242 | static int atyfb_ioctl(struct fb_info *info, u_int cmd, u_long arg); |
243 | extern void atyfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect); | ||
244 | extern void atyfb_copyarea(struct fb_info *info, const struct fb_copyarea *area); | ||
245 | extern void atyfb_imageblit(struct fb_info *info, const struct fb_image *image); | ||
246 | #ifdef __sparc__ | 243 | #ifdef __sparc__ |
247 | static int atyfb_mmap(struct fb_info *info, struct vm_area_struct *vma); | 244 | static int atyfb_mmap(struct fb_info *info, struct vm_area_struct *vma); |
248 | #endif | 245 | #endif |
diff --git a/drivers/video/aty/mach64_ct.c b/drivers/video/aty/mach64_ct.c index e7056934c6a8..5080816be653 100644 --- a/drivers/video/aty/mach64_ct.c +++ b/drivers/video/aty/mach64_ct.c | |||
@@ -27,7 +27,7 @@ u8 aty_ld_pll_ct(int offset, const struct atyfb_par *par) | |||
27 | return res; | 27 | return res; |
28 | } | 28 | } |
29 | 29 | ||
30 | void aty_st_pll_ct(int offset, u8 val, const struct atyfb_par *par) | 30 | static void aty_st_pll_ct(int offset, u8 val, const struct atyfb_par *par) |
31 | { | 31 | { |
32 | /* write addr byte */ | 32 | /* write addr byte */ |
33 | aty_st_8(CLOCK_CNTL_ADDR, ((offset << 2) & PLL_ADDR) | PLL_WR_EN, par); | 33 | aty_st_8(CLOCK_CNTL_ADDR, ((offset << 2) & PLL_ADDR) | PLL_WR_EN, par); |