Skip to content

Commit

Permalink
keucr: fixes do not use C99 // comments error
Browse files Browse the repository at this point in the history 
This patch fixes the following checkpatch error,
ERROR: do not use C99 // comments

Signed-off-by: Amarjargal Gundjalam <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
@amarjargal @gregkh
amarjargal authored and gregkh committed May 20, 2013
1 parent dc606b8 commit 1557a64
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 48 deletions.
69 changes: 35 additions & 34 deletions drivers/staging/keucr/smilmain.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,16 @@ DWORD ErrCode;
static BYTE WorkBuf[SECTSIZE];
static BYTE Redundant[REDTSIZE];
static BYTE WorkRedund[REDTSIZE];
static WORD *Log2Phy[MAX_ZONENUM]; // 128 x 1000, Log2Phy[MAX_ZONENUM][MAX_LOGBLOCK];
/* 128 x 1000, Log2Phy[MAX_ZONENUM][MAX_LOGBLOCK]; */
static WORD *Log2Phy[MAX_ZONENUM];
static BYTE Assign[MAX_ZONENUM][MAX_BLOCKNUM / 8];
static WORD AssignStart[MAX_ZONENUM];
WORD ReadBlock;
WORD WriteBlock;
DWORD MediaChange;
static DWORD SectCopyMode;

//BIT Control Macro
/* BIT Control Macro */
static BYTE BitData[] = { 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 };
#define Set_D_Bit(a, b) (a[(BYTE)((b) / 8)] |= BitData[(b) % 8])
#define Clr_D_Bit(a, b) (a[(BYTE)((b) / 8)] &= ~BitData[(b) % 8])
Expand All @@ -68,7 +69,7 @@ BYTE IsSSFDCCompliance;
BYTE IsXDCompliance;


//----- SM_FreeMem() -------------------------------------------------
/* ----- SM_FreeMem() ------------------------------------------------- */
int SM_FreeMem(void)
{
int i;
Expand All @@ -84,8 +85,8 @@ int SM_FreeMem(void)
return NO_ERROR;
}

//SmartMedia Read/Write/Erase Function
//----- Media_D_ReadSector() -------------------------------------------
/* SmartMedia Read/Write/Erase Function */
/* ----- Media_D_ReadSector() ------------------------------------------- */
int Media_D_ReadSector(struct us_data *us, DWORD start, WORD count, BYTE *buf)
{
WORD len, bn;
Expand Down Expand Up @@ -119,8 +120,8 @@ int Media_D_ReadSector(struct us_data *us, DWORD start, WORD count, BYTE *buf)

return NO_ERROR;
}
// here
//----- Media_D_CopySector() ------------------------------------------
/* here */
/* ----- Media_D_CopySector() ------------------------------------------ */
int Media_D_CopySector(struct us_data *us, DWORD start, WORD count, BYTE *buf)
{
WORD len, bn;
Expand Down Expand Up @@ -165,7 +166,7 @@ int Media_D_CopySector(struct us_data *us, DWORD start, WORD count, BYTE *buf)
return NO_ERROR;
}

//----- Release_D_CopySector() ------------------------------------------
/* ----- Release_D_CopySector() ------------------------------------------ */
int Release_D_CopySector(struct us_data *us)
{
Log2Phy[Media.Zone][Media.LogBlock] = WriteBlock;
Expand All @@ -182,8 +183,8 @@ int Release_D_CopySector(struct us_data *us)
return SMSUCCESS;
}

//SmartMedia Physical Format Test Subroutine
//----- Check_D_MediaFmt() ---------------------------------------------
/* SmartMedia Physical Format Test Subroutine */
/* ----- Check_D_MediaFmt() --------------------------------------------- */
int Check_D_MediaFmt(struct us_data *us)
{
pr_info("Check_D_MediaFmt\n");
Expand All @@ -208,8 +209,8 @@ int Check_D_MediaFmt(struct us_data *us)
return SMSUCCESS;
}

//SmartMedia Physical Address Control Subroutine
//----- Conv_D_MediaAddr() ---------------------------------------------
/* SmartMedia Physical Address Control Subroutine */
/* ----- Conv_D_MediaAddr() --------------------------------------------- */
int Conv_D_MediaAddr(struct us_data *us, DWORD addr)
{
DWORD temp;
Expand Down Expand Up @@ -238,7 +239,7 @@ int Conv_D_MediaAddr(struct us_data *us, DWORD addr)
return ERROR;
}

//----- Inc_D_MediaAddr() ----------------------------------------------
/* ----- Inc_D_MediaAddr() ---------------------------------------------- */
int Inc_D_MediaAddr(struct us_data *us)
{
WORD LogBlock = Media.LogBlock;
Expand Down Expand Up @@ -287,8 +288,8 @@ int Inc_D_MediaAddr(struct us_data *us)
return ERROR;
}

//SmartMedia Read/Write Subroutine with Retry
//----- Media_D_ReadOneSect() ------------------------------------------
/* SmartMedia Read/Write Subroutine with Retry */
/* ----- Media_D_ReadOneSect() ------------------------------------------ */
int Media_D_ReadOneSect(struct us_data *us, WORD count, BYTE *buf)
{
DWORD err, retry;
Expand Down Expand Up @@ -330,8 +331,8 @@ int Media_D_ReadOneSect(struct us_data *us, WORD count, BYTE *buf)
return ERROR;
}

//SmartMedia Physical Sector Data Copy Subroutine
//----- Copy_D_BlockAll() ----------------------------------------------
/* SmartMedia Physical Sector Data Copy Subroutine */
/* ----- Copy_D_BlockAll() ---------------------------------------------- */
int Copy_D_BlockAll(struct us_data *us, DWORD mode)
{
BYTE sect;
Expand Down Expand Up @@ -366,8 +367,8 @@ int Copy_D_BlockAll(struct us_data *us, DWORD mode)
return SMSUCCESS;
}

//SmartMedia Physical Block Assign/Release Subroutine
//----- Assign_D_WriteBlock() ------------------------------------------
/* SmartMedia Physical Block Assign/Release Subroutine */
/* ----- Assign_D_WriteBlock() ------------------------------------------ */
int Assign_D_WriteBlock(void)
{
ReadBlock = Media.PhyBlock;
Expand Down Expand Up @@ -398,7 +399,7 @@ int Assign_D_WriteBlock(void)
return ERROR;
}

//----- Release_D_ReadBlock() ------------------------------------------
/* ----- Release_D_ReadBlock() ------------------------------------------ */
int Release_D_ReadBlock(struct us_data *us)
{
DWORD mode;
Expand Down Expand Up @@ -432,7 +433,7 @@ int Release_D_ReadBlock(struct us_data *us)
return SMSUCCESS;
}

//----- Release_D_WriteBlock() -----------------------------------------
/* ----- Release_D_WriteBlock() ----------------------------------------- */
int Release_D_WriteBlock(struct us_data *us)
{
SectCopyMode = COMPLETED;
Expand All @@ -445,8 +446,8 @@ int Release_D_WriteBlock(struct us_data *us)
return SMSUCCESS;
}

//SmartMedia Physical Sector Data Copy Subroutine
//----- Copy_D_PhyOneSect() --------------------------------------------
/* SmartMedia Physical Sector Data Copy Subroutine */
/* ----- Copy_D_PhyOneSect() -------------------------------------------- */
int Copy_D_PhyOneSect(struct us_data *us)
{
int i;
Expand Down Expand Up @@ -521,8 +522,8 @@ int Copy_D_PhyOneSect(struct us_data *us)
return SMSUCCESS;
}

//SmartMedia Physical Sector Read/Write/Erase Subroutine
//----- Read_D_PhyOneSect() --------------------------------------------
/* SmartMedia Physical Sector Read/Write/Erase Subroutine */
/* ----- Read_D_PhyOneSect() -------------------------------------------- */
int Read_D_PhyOneSect(struct us_data *us, WORD count, BYTE *buf)
{
int i;
Expand Down Expand Up @@ -573,7 +574,7 @@ int Read_D_PhyOneSect(struct us_data *us, WORD count, BYTE *buf)
return ERROR;
}

//----- Erase_D_PhyOneBlock() ------------------------------------------
/* ----- Erase_D_PhyOneBlock() ------------------------------------------ */
int Erase_D_PhyOneBlock(struct us_data *us)
{
if (Ssfdc_D_EraseBlock(us)) {
Expand All @@ -589,8 +590,8 @@ int Erase_D_PhyOneBlock(struct us_data *us)
return SMSUCCESS;
}

//SmartMedia Physical Format Check Local Subroutine
//----- Set_D_PhyFmtValue() --------------------------------------------
/* SmartMedia Physical Format Check Local Subroutine */
/* ----- Set_D_PhyFmtValue() -------------------------------------------- */
int Set_D_PhyFmtValue(struct us_data *us)
{
if (Set_D_SsfdcModel(us->SM_DeviceID))
Expand All @@ -599,7 +600,7 @@ int Set_D_PhyFmtValue(struct us_data *us)
return SMSUCCESS;
}

//----- Search_D_CIS() -------------------------------------------------
/* ----- Search_D_CIS() ------------------------------------------------- */
int Search_D_CIS(struct us_data *us)
{
Media.Zone = 0;
Expand Down Expand Up @@ -651,7 +652,7 @@ int Search_D_CIS(struct us_data *us)
return ERROR;
}

//----- Make_D_LogTable() ----------------------------------------------
/* ----- Make_D_LogTable() ---------------------------------------------- */
int Make_D_LogTable(struct us_data *us)
{
WORD phyblock, logblock;
Expand Down Expand Up @@ -740,17 +741,17 @@ int Make_D_LogTable(struct us_data *us)
Media.Sector = 0;
Media.PhyBlock = phyblock;

} // End for (Media.PhyBlock<Ssfdc.MaxBlocks)
} /* End for (Media.PhyBlock<Ssfdc.MaxBlocks) */

AssignStart[Media.Zone] = 0;

} // End for (Media.Zone<MAX_ZONENUM)
} /* End for (Media.Zone<MAX_ZONENUM) */

Ssfdc_D_Reset(us);
return SMSUCCESS;
}

//----- MarkFail_D_PhyOneBlock() ---------------------------------------
/* ----- MarkFail_D_PhyOneBlock() --------------------------------------- */
int MarkFail_D_PhyOneBlock(struct us_data *us)
{
BYTE sect;
Expand All @@ -765,7 +766,7 @@ int MarkFail_D_PhyOneBlock(struct us_data *us)
ErrCode = ERR_HwError;
MediaChange = ERROR;
return ERROR;
} // NO Status Check
} /* NO Status Check */
}

Ssfdc_D_Reset(us);
Expand Down
29 changes: 15 additions & 14 deletions drivers/staging/keucr/usb.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Driver for USB Mass Storage compliant devices
/* Driver for USB Mass Storage compliant devices */

#ifndef _USB_H_
#define _USB_H_
Expand Down Expand Up @@ -26,19 +26,19 @@ struct us_unusual_dev {
int (*initFunction)(struct us_data *);
};

//EnE HW Register
/* EnE HW Register */
#define REG_CARD_STATUS 0xFF83
#define REG_HW_TRAP1 0xFF89

// SRB Status. Refers /usr/include/wine/wine/wnaspi32.h & SCSI sense key
#define SS_SUCCESS 0x00 // No Sense
/* SRB Status. Refers /usr/include/wine/wine/wnaspi32.h & SCSI sense key */
#define SS_SUCCESS 0x00 /* No Sense */
#define SS_NOT_READY 0x02
#define SS_MEDIUM_ERR 0x03
#define SS_HW_ERR 0x04
#define SS_ILLEGAL_REQUEST 0x05
#define SS_UNIT_ATTENTION 0x06

//ENE Load FW Pattern
/* ENE Load FW Pattern */
#define SD_INIT1_PATTERN 1
#define SD_INIT2_PATTERN 2
#define SD_RW_PATTERN 3
Expand Down Expand Up @@ -82,8 +82,9 @@ typedef struct _SM_STATUS {
BYTE IsMS:1;
} SM_STATUS, *PSM_STATUS;

// SD Block Length
#define SD_BLOCK_LEN 9 // 2^9 = 512 Bytes, The HW maximum read/write data length
/* SD Block Length */
#define SD_BLOCK_LEN 9 /* 2^9 = 512 Bytes,
The HW maximum read/write data length */

/* Dynamic bitflag definitions (us->dflags): used in set_bit() etc. */
#define US_FLIDX_URB_ACTIVE 0 /* current_urb is in use */
Expand Down Expand Up @@ -176,19 +177,19 @@ struct us_data {
#ifdef CONFIG_PM
pm_hook suspend_resume_hook;
#endif
// for 6250 code
/* for 6250 code */
SD_STATUS SD_Status;
MS_STATUS MS_Status;
SM_STATUS SM_Status;

//----- SD Control Data ----------------
//SD_REGISTER SD_Regs;
/* ----- SD Control Data ---------------- */
/* SD_REGISTER SD_Regs; */
WORD SD_Block_Mult;
BYTE SD_READ_BL_LEN;
WORD SD_C_SIZE;
BYTE SD_C_SIZE_MULT;

// SD/MMC New spec.
/* SD/MMC New spec. */
BYTE SD_SPEC_VER;
BYTE SD_CSD_VER;
BYTE SD20_HIGH_CAPACITY;
Expand All @@ -197,14 +198,14 @@ struct us_data {
BYTE MMC_BusWidth;
BYTE MMC_HIGH_CAPACITY;

//----- MS Control Data ----------------
/* ----- MS Control Data ---------------- */
BOOLEAN MS_SWWP;
DWORD MSP_TotalBlock;
/* MS_LibControl MS_Lib; */
BOOLEAN MS_IsRWPage;
WORD MS_Model;

//----- SM Control Data ----------------
/* ----- SM Control Data ---------------- */
BYTE SM_DeviceID;
BYTE SM_CardID;

Expand All @@ -213,7 +214,7 @@ struct us_data {
DWORD bl_num;
int SrbStatus;

//------Power Managerment ---------------
/* ------Power Managerment --------------- */
BOOLEAN Power_IsResum;
};

Expand Down

0 comments on commit 1557a64

Please sign in to comment.