diff options
| author | Ville Syrjala <syrjala@sci.fi> | 2006-12-08 11:40:41 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 17:29:07 +0100 |
| commit | 044aaa32e789492e638a229b5f1930bfb8bc75a1 (patch) | |
| tree | 016cce4b6bb97aa652dd4145224179d1fd01bc74 /drivers/video/aty | |
| parent | [PATCH] atyfb: Fix blanking level transitions (diff) | |
| download | linux-044aaa32e789492e638a229b5f1930bfb8bc75a1.tar.xz linux-044aaa32e789492e638a229b5f1930bfb8bc75a1.zip | |
[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>
Diffstat (limited to 'drivers/video/aty')
| -rw-r--r-- | drivers/video/aty/atyfb_base.c | 10 |
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); * 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_from_lcd(struct atyfb_par *par, } #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_info *info, const char *name) 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(struct pci_dev *pdev, const struct pci_devi 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(void) break; } - if (aty_init(info, "ISA bus")) { + if (aty_init(info)) { if (info->screen_base) iounmap(info->screen_base); if (par->ati_regbase) |