Commit e2e0b838 authored by Thomas Zimmermann's avatar Thomas Zimmermann Committed by Helge Deller

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: default avatarThomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent ca6c080e
...@@ -1389,7 +1389,6 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref) ...@@ -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() */ /* save for primary gfx device detection & unregister_framebuffer() */
sti->info = info;
if (register_framebuffer(fb->info) < 0) if (register_framebuffer(fb->info) < 0)
goto out_err4; goto out_err4;
...@@ -1417,7 +1416,6 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref) ...@@ -1417,7 +1416,6 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref)
iounmap(info->screen_base); iounmap(info->screen_base);
out_err0: out_err0:
framebuffer_release(info); framebuffer_release(info);
sti->info = NULL;
return -ENXIO; return -ENXIO;
} }
...@@ -1496,7 +1494,6 @@ stifb_cleanup(void) ...@@ -1496,7 +1494,6 @@ stifb_cleanup(void)
framebuffer_release(info); framebuffer_release(info);
dev_set_drvdata(sti->dev, NULL); dev_set_drvdata(sti->dev, NULL);
} }
sti->info = NULL;
} }
} }
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
#define STICORE_H #define STICORE_H
struct device; struct device;
struct fb_info;
/* generic STI structures & functions */ /* generic STI structures & functions */
...@@ -368,9 +367,6 @@ struct sti_struct { ...@@ -368,9 +367,6 @@ struct sti_struct {
/* PCI data structures (pg. 17ff from sti.pdf) */ /* PCI data structures (pg. 17ff from sti.pdf) */
u8 rm_entry[16]; /* pci region mapper array == pci config space offset */ 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 */ /* pointer to the parent device */
struct device *dev; struct device *dev;
......
Markdown is supported
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