From 12b8de566fa9ec428e724f955735fd1ca278ca4c Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Wed, 20 Dec 2023 14:22:54 +0100 Subject: video/sticore: Store ROM device in STI struct Store the ROM's parent device in each STI struct, so we can associate the STI framebuffer with a device. The new field will eventually replace the fbdev subsystem's info field, which the function fb_is_primary_device() currently requires to detect the firmware's output. By using the device instead of the framebuffer info, a later patch can generalize the helper for use in non-fbdev code. Signed-off-by: Thomas Zimmermann Signed-off-by: Helge Deller --- include/video/sticore.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include/video') diff --git a/include/video/sticore.h b/include/video/sticore.h index 012b5b46ad7d..9d993e22805d 100644 --- a/include/video/sticore.h +++ b/include/video/sticore.h @@ -2,6 +2,7 @@ #ifndef STICORE_H #define STICORE_H +struct device; struct fb_info; /* generic STI structures & functions */ @@ -370,6 +371,9 @@ struct sti_struct { /* pointer to the fb_info where this STI device is used */ struct fb_info *info; + /* pointer to the parent device */ + struct device *dev; + /* pointer to all internal data */ struct sti_all_data *sti_data; -- cgit v1.2.3 From e2e0b838a1849f92612a8305c09aaf31bf824350 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Wed, 20 Dec 2023 14:22:57 +0100 Subject: 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 Signed-off-by: Helge Deller --- include/video/sticore.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'include/video') 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; -- cgit v1.2.3