Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 978cc90c authored by Alexander Beregalov's avatar Alexander Beregalov Committed by Linus Torvalds
Browse files

atyfb_base.c: fix warning 



drivers/video/aty/atyfb_base.c:2663: warning: 'aty_resume_chip' defined
but not used

Signed-off-by: default avatarAlexander 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5394ba0f

drivers/video/aty/atyfb_base.c

+15 −14
Original line number Original line Diff line number Diff line
@@ -244,7 +244,7 @@ static int atyfb_sync(struct fb_info *info); 
     */

     */





static int aty_init(struct fb_info *info);

static int aty_init(struct fb_info *info);

static void aty_resume_chip(struct fb_info *info);



#ifdef CONFIG_ATARI

#ifdef CONFIG_ATARI

static int store_video_par(char *videopar, unsigned char m64_num);

static int store_video_par(char *videopar, unsigned char m64_num);

#endif

#endif
@@ -2023,6 +2023,20 @@ static int atyfb_pci_suspend(struct pci_dev *pdev, pm_message_t state) 
	return 0;

	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)

static int atyfb_pci_resume(struct pci_dev *pdev)

{

{

	struct fb_info *info = pci_get_drvdata(pdev);

	struct fb_info *info = pci_get_drvdata(pdev);
@@ -2659,19 +2673,6 @@ static int __devinit aty_init(struct fb_info *info) 
	return ret;

	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

#ifdef CONFIG_ATARI

static int __devinit store_video_par(char *video_str, unsigned char m64_num)

static int __devinit store_video_par(char *video_str, unsigned char m64_num)

{

{