[patch 5/9] atyfb: Remove pointless aty_init() argument
From: syrjala@sci.fi
Date: 2006-09-03 22:00:25
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> --- drivers/video/aty/atyfb_base.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) Index: linux-2.6.18-rc4/drivers/video/aty/atyfb_base.c ===================================================================
--- linux-2.6.18-rc4.orig/drivers/video/aty/atyfb_base.c
+++ linux-2.6.18-rc4/drivers/video/aty/atyfb_base.c@@ -249,7 +249,7 @@ static int atyfb_sync(struct fb_info *in * Internal routines */ -static int aty_init(struct fb_info *info, const char *name); +static int aty_init(struct fb_info *info); #ifdef CONFIG_ATARI static int store_video_par(char *videopar, unsigned char m64_num); #endif
@@ -2340,7 +2340,7 @@ static int __devinit atyfb_get_timings_f } #endif /* defined(__i386__) && defined(CONFIG_FB_ATY_GENERIC_LCD) */ -static int __devinit aty_init(struct fb_info *info, const char *name) +static int __devinit aty_init(struct fb_info *info) { struct atyfb_par *par = (struct atyfb_par *) info->par; const char *ramname = NULL, *xtal;
@@ -2744,7 +2744,7 @@ static int __devinit aty_init(struct fb_ fb_list = info; PRINTKI("fb%d: %s frame buffer device on %s\n", - info->node, info->fix.id, name); + info->node, info->fix.id, par->bus_type == ISA ? "ISA" : "PCI"); return 0; aty_init_exit:
@@ -3589,7 +3589,7 @@ static int __devinit atyfb_pci_probe(str pci_set_drvdata(pdev, info); /* Init chip & register framebuffer */ - if (aty_init(info, "PCI")) + if (aty_init(info)) goto err_release_io; #ifdef __sparc__
@@ -3689,7 +3689,7 @@ static int __devinit atyfb_atari_probe(v break; } - if (aty_init(info, "ISA bus")) { + if (aty_init(info)) { framebuffer_release(info); /* This is insufficient! kernel_map has added two large chunks!! */ return -ENXIO;
--
Ville Syrj������������������l������������������
syrjala@sci.fi
http://www.sci.fi/~syrjala/