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@xxxxxxx>
Tested-by: Helge Deller <deller@xxxxxx>
Reviewed-by: Helge Deller <deller@xxxxxx>
---
drivers/video/fbdev/stifb.c | 3 ---
include/video/sticore.h | 4 ----
2 files changed, 7 deletions(-)
diff --git a/drivers/video/fbdev/stifb.c b/drivers/video/fbdev/stifb.c
index 9954640faae6..8e5bac27542d 100644
--- a/drivers/video/fbdev/stifb.c
+++ b/drivers/video/fbdev/stifb.c
@@ -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 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref)
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;
}
}
diff --git a/include/video/sticore.h b/include/video/sticore.h
index 9d993e22805d..823666af1871 100644
--- a/include/video/sticore.h
+++ b/include/video/sticore.h
@@ -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;
--
2.43.0
