video/sticore: Remove info field from STI struct
The info field in struct sti_struct was used to detect the default display device. That test is now done with the respective Linux device and the info field is unused. Remove it. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Signed-off-by: Helge Deller <deller@gmx.de>
This commit is contained in:
parent
ca6c080eef
commit
e2e0b838a1
@ -1389,7 +1389,6 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref)
|
||||
}
|
||||
|
||||
/* save for primary gfx device detection & unregister_framebuffer() */
|
||||
sti->info = info;
|
||||
if (register_framebuffer(fb->info) < 0)
|
||||
goto out_err4;
|
||||
|
||||
@ -1417,7 +1416,6 @@ out_err1:
|
||||
iounmap(info->screen_base);
|
||||
out_err0:
|
||||
framebuffer_release(info);
|
||||
sti->info = NULL;
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
@ -1496,7 +1494,6 @@ stifb_cleanup(void)
|
||||
framebuffer_release(info);
|
||||
dev_set_drvdata(sti->dev, NULL);
|
||||
}
|
||||
sti->info = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -3,7 +3,6 @@
|
||||
#define STICORE_H
|
||||
|
||||
struct device;
|
||||
struct fb_info;
|
||||
|
||||
/* generic STI structures & functions */
|
||||
|
||||
@ -368,9 +367,6 @@ struct sti_struct {
|
||||
/* PCI data structures (pg. 17ff from sti.pdf) */
|
||||
u8 rm_entry[16]; /* pci region mapper array == pci config space offset */
|
||||
|
||||
/* pointer to the fb_info where this STI device is used */
|
||||
struct fb_info *info;
|
||||
|
||||
/* pointer to the parent device */
|
||||
struct device *dev;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user