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

Commit 1d9f9a9b authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

Staging: xgifb: Remove XGI_DSReg and PXGI_DSReg typedefs 



Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 621a683f

drivers/staging/xgifb/XGI_main_26.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/staging/xgifb/vb_init.c

+1 −1
Original line number Diff line number Diff line
@@ -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 ;

drivers/staging/xgifb/vgatypes.h

+5 −6
Original line number Diff line number Diff line
@@ -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 */