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

[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: 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 27b68597
...@@ -249,7 +249,7 @@ static int atyfb_sync(struct fb_info *info); ...@@ -249,7 +249,7 @@ static int atyfb_sync(struct fb_info *info);
* Internal routines * Internal routines
*/ */
static int aty_init(struct fb_info *info, const char *name); static int aty_init(struct fb_info *info);
#ifdef CONFIG_ATARI #ifdef CONFIG_ATARI
static int store_video_par(char *videopar, unsigned char m64_num); static int store_video_par(char *videopar, unsigned char m64_num);
#endif #endif
...@@ -2344,7 +2344,7 @@ static int __devinit atyfb_get_timings_from_lcd(struct atyfb_par *par, ...@@ -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) */ #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; struct atyfb_par *par = (struct atyfb_par *) info->par;
const char *ramname = NULL, *xtal; const char *ramname = NULL, *xtal;
...@@ -2748,7 +2748,7 @@ static int __devinit aty_init(struct fb_info *info, const char *name) ...@@ -2748,7 +2748,7 @@ static int __devinit aty_init(struct fb_info *info, const char *name)
fb_list = info; fb_list = info;
PRINTKI("fb%d: %s frame buffer device on %s\n", 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; return 0;
aty_init_exit: aty_init_exit:
...@@ -3597,7 +3597,7 @@ static int __devinit atyfb_pci_probe(struct pci_dev *pdev, const struct pci_devi ...@@ -3597,7 +3597,7 @@ static int __devinit atyfb_pci_probe(struct pci_dev *pdev, const struct pci_devi
pci_set_drvdata(pdev, info); pci_set_drvdata(pdev, info);
/* Init chip & register framebuffer */ /* Init chip & register framebuffer */
if (aty_init(info, "PCI")) if (aty_init(info))
goto err_release_io; goto err_release_io;
#ifdef __sparc__ #ifdef __sparc__
...@@ -3697,7 +3697,7 @@ static int __devinit atyfb_atari_probe(void) ...@@ -3697,7 +3697,7 @@ static int __devinit atyfb_atari_probe(void)
break; break;
} }
if (aty_init(info, "ISA bus")) { if (aty_init(info)) {
if (info->screen_base) if (info->screen_base)
iounmap(info->screen_base); iounmap(info->screen_base);
if (par->ati_regbase) if (par->ati_regbase)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment