From fb03d4fc6c9bc4bf509221101639cde1b8330405 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Mon, 9 May 2011 10:47:51 -0700 Subject: staging/keucr: don't use SUCCESS as macro name Don't use "SUCCESS" as a macro name. This collides with SCSI's macro of the same name, but with a different value: drivers/staging/keucr/smcommon.h:9:9: warning: preprocessor token SUCCESS redefined include/scsi/scsi.h:463:9: this was the original definition Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman --- drivers/staging/keucr/smcommon.h | 2 +- drivers/staging/keucr/smilmain.c | 104 +++++++++++++++++++-------------------- drivers/staging/keucr/smilsub.c | 62 +++++++++++------------ 3 files changed, 84 insertions(+), 84 deletions(-) (limited to 'drivers/staging/keucr') diff --git a/drivers/staging/keucr/smcommon.h b/drivers/staging/keucr/smcommon.h index 00064ca..278bdb8 100644 --- a/drivers/staging/keucr/smcommon.h +++ b/drivers/staging/keucr/smcommon.h @@ -6,7 +6,7 @@ /*************************************************************************** Define Difinetion ***************************************************************************/ -#define SUCCESS 0x0000 /* SUCCESS */ +#define SMSUCCESS 0x0000 /* SUCCESS */ #define ERROR 0xFFFF /* ERROR */ #define CORRECT 0x0001 /* CORRECTABLE */ diff --git a/drivers/staging/keucr/smilmain.c b/drivers/staging/keucr/smilmain.c index 1ca99b4..31f7813 100644 --- a/drivers/staging/keucr/smilmain.c +++ b/drivers/staging/keucr/smilmain.c @@ -252,13 +252,13 @@ int Release_D_CopySector(struct us_data *us) if (Media.PhyBlock==NO_ASSIGN) { Media.PhyBlock=WriteBlock; - return(SUCCESS); + return(SMSUCCESS); } Clr_D_Bit(Assign[Media.Zone],Media.PhyBlock); Media.PhyBlock=WriteBlock; - return(SUCCESS); + return(SMSUCCESS); } /* //----- Media_D_WriteSector() ------------------------------------------ @@ -568,7 +568,7 @@ int Media_D_OneSectWriteFlush(PFDO_DEVICE_EXTENSION fdoExt) // default: *c= 0; *h= 0; *s= 0; ErrCode = ERR_NoSmartMedia; return(ERROR); // } // -// return(SUCCESS); +// return(SMSUCCESS); //} // ////Power Control & Media Exist Check Subroutine @@ -595,7 +595,7 @@ int Media_D_OneSectWriteFlush(PFDO_DEVICE_EXTENSION fdoExt) // MediaChange = ERROR; // //usleep(56*1024); // if ((!Check_D_CntPower())&&(!MediaChange)) // 有 power & Media 沒被 change, 則 return success -// return(SUCCESS); +// return(SMSUCCESS); // //usleep(56*1024); // // if (Check_D_CardExist()) // Check if card is not exist, return err @@ -614,7 +614,7 @@ int Media_D_OneSectWriteFlush(PFDO_DEVICE_EXTENSION fdoExt) // //usleep(56*1024); // Ssfdc_D_Reset(fdoExt); // //usleep(56*1024); -// return(SUCCESS); +// return(SMSUCCESS); //} // ////-----Check_D_MediaExist() -------------------------------------------- @@ -626,7 +626,7 @@ int Media_D_OneSectWriteFlush(PFDO_DEVICE_EXTENSION fdoExt) // if (!Check_D_CardExist()) // { // if (!MediaChange) -// return(SUCCESS); +// return(SMSUCCESS); // // ErrCode = ERR_ChangedMedia; // return(ERROR); @@ -646,7 +646,7 @@ int Media_D_OneSectWriteFlush(PFDO_DEVICE_EXTENSION fdoExt) // return(ERROR); // } // -// return(SUCCESS); +// return(SMSUCCESS); //} */ //SmartMedia Physical Format Test Subroutine @@ -658,7 +658,7 @@ int Check_D_MediaFmt(struct us_data *us) //usleep(56*1024); if (!MediaChange) - return(SUCCESS); + return(SMSUCCESS); MediaChange = ERROR; SectCopyMode = COMPLETED; @@ -678,8 +678,8 @@ int Check_D_MediaFmt(struct us_data *us) } - MediaChange = SUCCESS; - return(SUCCESS); + MediaChange = SMSUCCESS; + return(SMSUCCESS); } /* ////----- Check_D_BlockIsFull() ---------------------------------- @@ -731,7 +731,7 @@ int Check_D_MediaFmt(struct us_data *us) // return(ERROR); // } // -// return(SUCCESS); +// return(SMSUCCESS); //} */ //SmartMedia Physical Address Control Subroutine @@ -763,7 +763,7 @@ int Conv_D_MediaAddr(struct us_data *us, DWORD addr) Clr_D_RedundantData(Redundant); Set_D_LogBlockAddr(Redundant); Media.PhyBlock = Log2Phy[Media.Zone][Media.LogBlock]; - return(SUCCESS); + return(SMSUCCESS); } ErrCode = ERR_OutOfLBA; @@ -778,7 +778,7 @@ int Inc_D_MediaAddr(struct us_data *us) //ADDRESS_T bb = (ADDRESS_T) &Media; if (++Media.Sector3) -// return(SUCCESS); // Card exist in Slot +// return(SMSUCCESS); // Card exist in Slot // if (k>3) // return(ERROR); // NO Card exist in Slot // @@ -1458,12 +1458,12 @@ BYTE _Check_D_DevCode(BYTE dcode) // if (_Hw_D_ChkStatus()) // return(ERROR); // Status Change // -// return(SUCCESS); // Not Status Change +// return(SMSUCCESS); // Not Status Change //} // ////----- Check_D_SsfdcWP() ---------------------------------------------- //int Check_D_SsfdcWP(void) -//{ // ERROR: WP, SUCCESS: Not WP +//{ // ERROR: WP, SMSUCCESS: Not WP // char i; // // for(i=0; i<8; i++) { @@ -1472,7 +1472,7 @@ BYTE _Check_D_DevCode(BYTE dcode) // _Wait_D_Timer(TIME_WPCHK); // } // -// return(SUCCESS); +// return(SMSUCCESS); //} // */ @@ -1480,13 +1480,13 @@ BYTE _Check_D_DevCode(BYTE dcode) //----- Check_D_ReadError() ---------------------------------------------- int Check_D_ReadError(BYTE *redundant) { - return SUCCESS; + return SMSUCCESS; } //----- Check_D_Correct() ---------------------------------------------- int Check_D_Correct(BYTE *buf,BYTE *redundant) { - return SUCCESS; + return SMSUCCESS; } //----- Check_D_CISdata() ---------------------------------------------- @@ -1498,7 +1498,7 @@ int Check_D_CISdata(BYTE *buf, BYTE *redundant) int cis_len = sizeof(cis); if (!IsSSFDCCompliance && !IsXDCompliance) - return SUCCESS; + return SMSUCCESS; if (!memcmp(redundant + 0x0D, EccBuf, 3)) return memcmp(buf, cis, cis_len); @@ -1597,5 +1597,5 @@ int SM_ReadBlock(PFDO_DEVICE_EXTENSION fdoExt, BYTE *buf,BYTE *redundant) if (!NT_SUCCESS(ntStatus)) return(ERROR); - return(SUCCESS); + return(SMSUCCESS); }*/ -- cgit v1.1