aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVille Syrjala <syrjala@sci.fi>2006-12-08 05:40:41 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 11:29:07 -0500
commit044aaa32e789492e638a229b5f1930bfb8bc75a1 (patch)
tree016cce4b6bb97aa652dd4145224179d1fd01bc74
parent27b6859799ea766281828588e1adb17751193075 (diff)
[PATCH] atyfb: Remove pointless aty_init() argument
The 'name' argument of aty_init() is pointless because the bus type can be queried from the hardware. Signed-off-by: Ville Syrjala <syrjala@sci.fi> Cc: "Antonino A. Daplas" <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/video/aty/atyfb_base.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index e6c3991f61ec..1b3d3a27307c 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -249,7 +249,7 @@ static int atyfb_sync(struct fb_info *info);
249 * Internal routines 249 * Internal routines
250 */ 250 */
251 251
252static int aty_init(struct fb_info *info, const char *name); 252static int aty_init(struct fb_info *info);
253#ifdef CONFIG_ATARI 253#ifdef CONFIG_ATARI
254static int store_video_par(char *videopar, unsigned char m64_num); 254static int store_video_par(char *videopar, unsigned char m64_num);
255#endif 255#endif
@@ -2344,7 +2344,7 @@ static int __devinit atyfb_get_timings_from_lcd(struct atyfb_par *par,
2344} 2344}
2345#endif /* defined(__i386__) && defined(CONFIG_FB_ATY_GENERIC_LCD) */ 2345#endif /* defined(__i386__) && defined(CONFIG_FB_ATY_GENERIC_LCD) */
2346 2346
2347static int __devinit aty_init(struct fb_info *info, const char *name) 2347static int __devinit aty_init(struct fb_info *info)
2348{ 2348{
2349 struct atyfb_par *par = (struct atyfb_par *) info->par; 2349 struct atyfb_par *par = (struct atyfb_par *) info->par;
2350 const char *ramname = NULL, *xtal; 2350 const char *ramname = NULL, *xtal;
@@ -2748,7 +2748,7 @@ static int __devinit aty_init(struct fb_info *info, const char *name)
2748 fb_list = info; 2748 fb_list = info;
2749 2749
2750 PRINTKI("fb%d: %s frame buffer device on %s\n", 2750 PRINTKI("fb%d: %s frame buffer device on %s\n",
2751 info->node, info->fix.id, name); 2751 info->node, info->fix.id, par->bus_type == ISA ? "ISA" : "PCI");
2752 return 0; 2752 return 0;
2753 2753
2754aty_init_exit: 2754aty_init_exit:
@@ -3597,7 +3597,7 @@ static int __devinit atyfb_pci_probe(struct pci_dev *pdev, const struct pci_devi
3597 pci_set_drvdata(pdev, info); 3597 pci_set_drvdata(pdev, info);
3598 3598
3599 /* Init chip & register framebuffer */ 3599 /* Init chip & register framebuffer */
3600 if (aty_init(info, "PCI")) 3600 if (aty_init(info))
3601 goto err_release_io; 3601 goto err_release_io;
3602 3602
3603#ifdef __sparc__ 3603#ifdef __sparc__
@@ -3697,7 +3697,7 @@ static int __devinit atyfb_atari_probe(void)
3697 break; 3697 break;
3698 } 3698 }
3699 3699
3700 if (aty_init(info, "ISA bus")) { 3700 if (aty_init(info)) {
3701 if (info->screen_base) 3701 if (info->screen_base)
3702 iounmap(info->screen_base); 3702 iounmap(info->screen_base);
3703 if (par->ati_regbase) 3703 if (par->ati_regbase)