[patch 21/25] atyfb: Remove pointless aty_init() argument
DORMANTno replies
From: <hidden>
Date: 2006-11-02 05:51:44
From: Ville Syrjala <syrjala@sci.fi> 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" <redacted> Signed-off-by: Andrew Morton <redacted> --- drivers/video/aty/atyfb_base.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff -puN drivers/video/aty/atyfb_base.c~atyfb-remove-pointless-aty_init drivers/video/aty/atyfb_base.c
--- a/drivers/video/aty/atyfb_base.c~atyfb-remove-pointless-aty_init
+++ a/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
@@ -2344,7 +2344,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;
@@ -2748,7 +2748,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:
@@ -3597,7 +3597,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__
@@ -3697,7 +3697,7 @@ static int __devinit atyfb_atari_probe(v break; } - if (aty_init(info, "ISA bus")) { + if (aty_init(info)) { if (info->screen_base) iounmap(info->screen_base); if (par->ati_regbase)
_ ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642