diff options
author | Alexander Beregalov <a.beregalov@gmail.com> | 2008-08-05 16:01:29 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-05 17:33:49 -0400 |
commit | 978cc90c469b38bcbbfd00a8c183d74e5b17bf45 (patch) | |
tree | 55fbc5f8857e0d4ce17b48416f21e27f2cce0995 /drivers/video | |
parent | 5394ba0fd892291eb425649fdbc82b673e0b7956 (diff) |
atyfb_base.c: fix warning
drivers/video/aty/atyfb_base.c:2663: warning: 'aty_resume_chip' defined
but not used
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Cc: Ville Syrjala <syrjala@sci.fi>
Cc: Antonino A. Daplas <adaplas@pol.net>
Cc: Mark Asselstine <asselsm@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/aty/atyfb_base.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index 620ba8120368..cc6b470073da 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c | |||
@@ -244,7 +244,7 @@ static int atyfb_sync(struct fb_info *info); | |||
244 | */ | 244 | */ |
245 | 245 | ||
246 | static int aty_init(struct fb_info *info); | 246 | static int aty_init(struct fb_info *info); |
247 | static void aty_resume_chip(struct fb_info *info); | 247 | |
248 | #ifdef CONFIG_ATARI | 248 | #ifdef CONFIG_ATARI |
249 | static int store_video_par(char *videopar, unsigned char m64_num); | 249 | static int store_video_par(char *videopar, unsigned char m64_num); |
250 | #endif | 250 | #endif |
@@ -2023,6 +2023,20 @@ static int atyfb_pci_suspend(struct pci_dev *pdev, pm_message_t state) | |||
2023 | return 0; | 2023 | return 0; |
2024 | } | 2024 | } |
2025 | 2025 | ||
2026 | static void aty_resume_chip(struct fb_info *info) | ||
2027 | { | ||
2028 | struct atyfb_par *par = info->par; | ||
2029 | |||
2030 | aty_st_le32(MEM_CNTL, par->mem_cntl, par); | ||
2031 | |||
2032 | if (par->pll_ops->resume_pll) | ||
2033 | par->pll_ops->resume_pll(info, &par->pll); | ||
2034 | |||
2035 | if (par->aux_start) | ||
2036 | aty_st_le32(BUS_CNTL, | ||
2037 | aty_ld_le32(BUS_CNTL, par) | BUS_APER_REG_DIS, par); | ||
2038 | } | ||
2039 | |||
2026 | static int atyfb_pci_resume(struct pci_dev *pdev) | 2040 | static int atyfb_pci_resume(struct pci_dev *pdev) |
2027 | { | 2041 | { |
2028 | struct fb_info *info = pci_get_drvdata(pdev); | 2042 | struct fb_info *info = pci_get_drvdata(pdev); |
@@ -2659,19 +2673,6 @@ aty_init_exit: | |||
2659 | return ret; | 2673 | return ret; |
2660 | } | 2674 | } |
2661 | 2675 | ||
2662 | static void aty_resume_chip(struct fb_info *info) | ||
2663 | { | ||
2664 | struct atyfb_par *par = info->par; | ||
2665 | |||
2666 | aty_st_le32(MEM_CNTL, par->mem_cntl, par); | ||
2667 | |||
2668 | if (par->pll_ops->resume_pll) | ||
2669 | par->pll_ops->resume_pll(info, &par->pll); | ||
2670 | |||
2671 | if (par->aux_start) | ||
2672 | aty_st_le32(BUS_CNTL, aty_ld_le32(BUS_CNTL, par) | BUS_APER_REG_DIS, par); | ||
2673 | } | ||
2674 | |||
2675 | #ifdef CONFIG_ATARI | 2676 | #ifdef CONFIG_ATARI |
2676 | static int __devinit store_video_par(char *video_str, unsigned char m64_num) | 2677 | static int __devinit store_video_par(char *video_str, unsigned char m64_num) |
2677 | { | 2678 | { |