Skip to content

Commit

Permalink
atyfb_base.c: fix warning
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alexander Beregalov authored and Linus Torvalds committed Aug 5, 2008
1 parent 5394ba0 commit 978cc90
Showing 1 changed file with 15 additions and 14 deletions.
29 changes: 15 additions & 14 deletions drivers/video/aty/atyfb_base.c
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ static int atyfb_sync(struct fb_info *info);
*/

static int aty_init(struct fb_info *info);
static void aty_resume_chip(struct fb_info *info);

#ifdef CONFIG_ATARI
static int store_video_par(char *videopar, unsigned char m64_num);
#endif
Expand Down Expand Up @@ -2023,6 +2023,20 @@ static int atyfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
return 0;
}

static void aty_resume_chip(struct fb_info *info)
{
struct atyfb_par *par = info->par;

aty_st_le32(MEM_CNTL, par->mem_cntl, par);

if (par->pll_ops->resume_pll)
par->pll_ops->resume_pll(info, &par->pll);

if (par->aux_start)
aty_st_le32(BUS_CNTL,
aty_ld_le32(BUS_CNTL, par) | BUS_APER_REG_DIS, par);
}

static int atyfb_pci_resume(struct pci_dev *pdev)
{
struct fb_info *info = pci_get_drvdata(pdev);
Expand Down Expand Up @@ -2659,19 +2673,6 @@ static int __devinit aty_init(struct fb_info *info)
return ret;
}

static void aty_resume_chip(struct fb_info *info)
{
struct atyfb_par *par = info->par;

aty_st_le32(MEM_CNTL, par->mem_cntl, par);

if (par->pll_ops->resume_pll)
par->pll_ops->resume_pll(info, &par->pll);

if (par->aux_start)
aty_st_le32(BUS_CNTL, aty_ld_le32(BUS_CNTL, par) | BUS_APER_REG_DIS, par);
}

#ifdef CONFIG_ATARI
static int __devinit store_video_par(char *video_str, unsigned char m64_num)
{
Expand Down

0 comments on commit 978cc90

Please sign in to comment.