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

Commit c98959f5 authored by Ville Syrjala's avatar Ville Syrjala Committed by Linus Torvalds
Browse files

[PATCH] atyfb: Fix compiler warnings 



Fix some compiler warnings and remove an #ifdef.

Signed-off-by: default avatarVille Syrjala <syrjala@sci.fi>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 05978501

drivers/video/aty/atyfb_base.c

+18 −17
Original line number Original line Diff line number Diff line
@@ -2350,11 +2350,7 @@ static int __devinit aty_init(struct fb_info *info, const char *name) 
	const char *ramname = NULL, *xtal;

	const char *ramname = NULL, *xtal;

	int gtb_memsize, has_var = 0;

	int gtb_memsize, has_var = 0;

	struct fb_var_screeninfo var;

	struct fb_var_screeninfo var;

	u8 pll_ref_div;

	u32 i;

	u32 i;

#if defined(CONFIG_PPC)

	int sense;

#endif





	init_waitqueue_head(&par->vblank.wait);

	init_waitqueue_head(&par->vblank.wait);

	spin_lock_init(&par->int_lock);

	spin_lock_init(&par->int_lock);
@@ -2464,8 +2460,10 @@ static int __devinit aty_init(struct fb_info *info, const char *name) 
			par->pll_limits.mclk = 63;

			par->pll_limits.mclk = 63;

	}

	}





	if (M64_HAS(GTB_DSP)

	if (M64_HAS(GTB_DSP)) {

	    && (pll_ref_div = aty_ld_pll_ct(PLL_REF_DIV, par))) {

		u8 pll_ref_div = aty_ld_pll_ct(PLL_REF_DIV, par);



		if (pll_ref_div) {

			int diff1, diff2;

			int diff1, diff2;

			diff1 = 510 * 14 / pll_ref_div - par->pll_limits.pll_max;

			diff1 = 510 * 14 / pll_ref_div - par->pll_limits.pll_max;

			diff2 = 510 * 29 / pll_ref_div - par->pll_limits.pll_max;

			diff2 = 510 * 29 / pll_ref_div - par->pll_limits.pll_max;
@@ -2478,6 +2476,7 @@ static int __devinit aty_init(struct fb_info *info, const char *name) 
				xtal = "29.498928";

				xtal = "29.498928";

			}

			}

		}

		}

	}

#endif /* CONFIG_FB_ATY_CT */

#endif /* CONFIG_FB_ATY_CT */





	/* save previous video mode */

	/* save previous video mode */
@@ -2668,6 +2667,7 @@ static int __devinit aty_init(struct fb_info *info, const char *name) 
				has_var = 1;

				has_var = 1;

		} else {

		} else {

			if (default_vmode == VMODE_CHOOSE) {

			if (default_vmode == VMODE_CHOOSE) {

				int sense;

				if (M64_HAS(G3_PB_1024x768))

				if (M64_HAS(G3_PB_1024x768))

					/* G3 PowerBook with 1024x768 LCD */

					/* G3 PowerBook with 1024x768 LCD */

					default_vmode = VMODE_1024_768_60;

					default_vmode = VMODE_1024_768_60;
@@ -3711,6 +3711,8 @@ static int __devinit atyfb_atari_probe(void) 




#endif /* CONFIG_ATARI */

#endif /* CONFIG_ATARI */





#ifdef CONFIG_PCI



static void __devexit atyfb_remove(struct fb_info *info)

static void __devexit atyfb_remove(struct fb_info *info)

{

{

	struct atyfb_par *par = (struct atyfb_par *) info->par;

	struct atyfb_par *par = (struct atyfb_par *) info->par;
@@ -3758,7 +3760,6 @@ static void __devexit atyfb_remove(struct fb_info *info) 
	framebuffer_release(info);

	framebuffer_release(info);

}

}





#ifdef CONFIG_PCI





static void __devexit atyfb_pci_remove(struct pci_dev *pdev)

static void __devexit atyfb_pci_remove(struct pci_dev *pdev)

{

{