Skip to content

Commit

Permalink
video/sticore: Remove info field from STI struct
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Thomas Zimmermann authored and Helge Deller committed Jan 12, 2024
1 parent ca6c080 commit e2e0b83
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 7 deletions.
3 changes: 0 additions & 3 deletions drivers/video/fbdev/stifb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -1496,7 +1494,6 @@ stifb_cleanup(void)
framebuffer_release(info);
dev_set_drvdata(sti->dev, NULL);
}
sti->info = NULL;
}
}

Expand Down
4 changes: 0 additions & 4 deletions include/video/sticore.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#define STICORE_H

struct device;
struct fb_info;

/* generic STI structures & functions */

Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit e2e0b83

Please sign in to comment.