Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab886ff8 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

staging: xgifb: rename struct video_info to xgifb_video_info 



Rename struct video_info to xgifb_video_info.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7548a83e

drivers/staging/xgifb/XGI_main_26.c

+2 −2
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ static inline void dumpVGAReg(void) 
#endif



/* data for XGI components */

struct video_info xgi_video_info;

struct xgifb_video_info xgi_video_info;



#if 1

#define DEBUGPRN(x)
@@ -2412,7 +2412,7 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, 


static void __devexit xgifb_remove(struct pci_dev *pdev)

{

	struct video_info *xgifb_info = pci_get_drvdata(pdev);

	struct xgifb_video_info *xgifb_info = pci_get_drvdata(pdev);

	struct fb_info *fb_info = xgifb_info->fb_info;



	unregister_framebuffer(fb_info);

drivers/staging/xgifb/XGIfb.h

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ enum xgi_tv_plug { /* vicki@030226 */ 
	TVPLUG_TOTAL

};



struct video_info {

struct xgifb_video_info {

	struct fb_info *fb_info;

	struct xgi_hw_device_info hw_info;
@@ -102,6 +102,6 @@ struct video_info { 
};





extern struct video_info xgi_video_info;

extern struct xgifb_video_info xgi_video_info;



#endif

drivers/staging/xgifb/vb_init.c

+1 −1
Original line number Diff line number Diff line
@@ -1431,7 +1431,7 @@ static unsigned char GetXG27FPBits(struct vb_device_info *pVBInfo) 


unsigned char XGIInitNew(struct pci_dev *pdev)

{

	struct video_info *xgifb_info = pci_get_drvdata(pdev);

	struct xgifb_video_info *xgifb_info = pci_get_drvdata(pdev);

	struct xgi_hw_device_info *HwDeviceExtension = &xgifb_info->hw_info;

	struct vb_device_info VBINF;

	struct vb_device_info *pVBInfo = &VBINF;