tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Thomas Zimmermann and committed by
Helge Deller e2e0b838 ca6c080e

-7
-3
drivers/video/fbdev/stifb.c
··· 1389 1389 } 1390 1390 1391 1391 /* save for primary gfx device detection & unregister_framebuffer() */ 1392 - sti->info = info; 1393 1392 if (register_framebuffer(fb->info) < 0) 1394 1393 goto out_err4; 1395 1394 ··· 1416 1417 iounmap(info->screen_base); 1417 1418 out_err0: 1418 1419 framebuffer_release(info); 1419 - sti->info = NULL; 1420 1420 return -ENXIO; 1421 1421 } 1422 1422 ··· 1494 1496 framebuffer_release(info); 1495 1497 dev_set_drvdata(sti->dev, NULL); 1496 1498 } 1497 - sti->info = NULL; 1498 1499 } 1499 1500 } 1500 1501
-4
include/video/sticore.h
··· 3 3 #define STICORE_H 4 4 5 5 struct device; 6 - struct fb_info; 7 6 8 7 /* generic STI structures & functions */ 9 8 ··· 366 367 367 368 /* PCI data structures (pg. 17ff from sti.pdf) */ 368 369 u8 rm_entry[16]; /* pci region mapper array == pci config space offset */ 369 - 370 - /* pointer to the fb_info where this STI device is used */ 371 - struct fb_info *info; 372 370 373 371 /* pointer to the parent device */ 374 372 struct device *dev;