diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2010-06-17 13:10:49 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-22 14:33:33 -0700 |
| commit | 1d9f9a9ba8a51fc6ac750aa33432a5a52eff039a (patch) | |
| tree | 706c0d5e2368230cef9fdcdb7680143c0b886a5d /drivers/staging/xgifb | |
| parent | 621a683fe8003850cb9e9257f379b7c020157912 (diff) | |
Staging: xgifb: Remove XGI_DSReg and PXGI_DSReg typedefs
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/xgifb')
| -rw-r--r-- | drivers/staging/xgifb/XGI_main_26.c | 4 | ||||
| -rw-r--r-- | drivers/staging/xgifb/vb_init.c | 2 | ||||
| -rw-r--r-- | drivers/staging/xgifb/vgatypes.h | 11 |
3 files changed, 8 insertions, 9 deletions
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index faea2e740e4b..51392040ec72 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -2994,7 +2994,7 @@ int __devinit xgifb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) strcpy(XGIhw_ext.szVBIOSVer, "0.84"); - XGIhw_ext.pSR = vmalloc(sizeof(XGI_DSReg) * SR_BUFFER_SIZE); + XGIhw_ext.pSR = vmalloc(sizeof(struct XGI_DSReg) * SR_BUFFER_SIZE); if (XGIhw_ext.pSR == NULL) { printk(KERN_ERR "XGIfb: Fatal error: Allocating SRReg space failed.\n"); @@ -3002,7 +3002,7 @@ int __devinit xgifb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) } XGIhw_ext.pSR[0].jIdx = XGIhw_ext.pSR[0].jVal = 0xFF; - XGIhw_ext.pCR = vmalloc(sizeof(XGI_DSReg) * CR_BUFFER_SIZE); + XGIhw_ext.pCR = vmalloc(sizeof(struct XGI_DSReg) * CR_BUFFER_SIZE); if (XGIhw_ext.pCR == NULL) { vfree(XGIhw_ext.pSR); diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c index 343be2527a0e..06e229c70bcd 100644 --- a/drivers/staging/xgifb/vb_init.c +++ b/drivers/staging/xgifb/vb_init.c @@ -129,7 +129,7 @@ unsigned char XGIInitNew(PXGI_HW_DEVICE_INFO HwDeviceExtension) /* unsigned long j, k ; */ - PXGI_DSReg pSR ; + struct XGI_DSReg *pSR ; unsigned long Temp ; diff --git a/drivers/staging/xgifb/vgatypes.h b/drivers/staging/xgifb/vgatypes.h index c7d4eaf96e79..bf9058d89c37 100644 --- a/drivers/staging/xgifb/vgatypes.h +++ b/drivers/staging/xgifb/vgatypes.h @@ -52,13 +52,12 @@ enum XGI_LCD_TYPE { }; #endif -#ifndef PXGI_DSReg -typedef struct _XGI_DSReg +struct XGI_DSReg { unsigned char jIdx; unsigned char jVal; -} XGI_DSReg, *PXGI_DSReg; -#endif +}; + #ifndef XGI_HW_DEVICE_INFO @@ -116,12 +115,12 @@ struct _XGI_HW_DEVICE_INFO unsigned char bIsPowerSaving; /* True: XGIInit() is invoked by power management, otherwise by 2nd adapter's initialzation */ - PXGI_DSReg pSR; /* restore SR registers in initial function. */ + struct XGI_DSReg *pSR; /* restore SR registers in initial function. */ /* end data :(idx, val) = (FF, FF). */ /* Note : restore SR registers if */ /* bSkipDramSizing = 1 */ - PXGI_DSReg pCR; /* restore CR registers in initial function. */ + struct XGI_DSReg *pCR; /* restore CR registers in initial function. */ /* end data :(idx, val) = (FF, FF) */ /* Note : restore cR registers if */ /* bSkipDramSizing = 1 */ |