staging: rts5208: Eliminate the use of Camel Case
v4 cover staging: rts5208: Eliminate the use of Camel Case
Cleans up checks of "Avoid CamelCase" in tree rts5208
Changes in v4:
- Substitute constants in lower case to upper case
- Explain the reason of keeping a variable that is defined and it's not used
Changes in v3:
- Change the subject line of commits to make it more clear and informative
Changes in v2:
- Place the changes on variable's names in the use and definition in the same commit
I compile the kernel after each commit of the series to make sure it doesn't break the compilation.
Gabriela Bittencourt (3):
staging: rts5208: Eliminate the use of Camel Case in files ms.{h,c}
staging: rts5208: Eliminate the use of Camel Case in files xd.{h,c}
staging: rts5208: Eliminate the use of Camel Case in file sd.h
drivers/staging/rts5208/ms.c | 86 ++++++++++++++++++------------------ drivers/staging/rts5208/ms.h | 70 ++++++++++++++--------------- drivers/staging/rts5208/sd.h | 2 +- drivers/staging/rts5208/xd.c | 8 ++-- drivers/staging/rts5208/xd.h | 6 +-- 5 files changed, 86 insertions(+), 86 deletions(-)
Signature · 1 line
2.20.1
PATCH v4 1/3 staging: rts5208: Eliminate the use of Camel Case in files ms.{h,c}
Cleans up checks of "Avoid CamelCase" in files ms.{h,c}
---
Changes in v2:
- substitute variables in lower case to upper case
--- drivers/staging/rts5208/ms.c | 86 ++++++++++++++++++------------------ drivers/staging/rts5208/ms.h | 70 ++++++++++++++--------------- 2 files changed, 78 insertions(+), 78 deletions(-)
drivers/staging/rts5208/ms.c +43 -43
@@ -590,7 +590,7 @@ static int ms_identify_media_type(struct rtsx_chip *chip, int switch_8bit_bus)int retval, i;u8 val; - retval =ms_set_rw_reg_addr (chip, Pro_StatusReg,6 , SystemParm,1 ); + retval =ms_set_rw_reg_addr (chip,PRO_STATUS_REG ,6 ,SYSTEM_PARAM ,1 );if (retval !=STATUS_SUCCESS )return STATUS_FAIL ;
@@ -840,7 +840,7 @@ static int msxc_change_power(struct rtsx_chip *chip, u8 mode)ms_cleanup_work (chip); - retval =ms_set_rw_reg_addr (chip,0 ,0 , Pro_DataCount1,6 ); + retval =ms_set_rw_reg_addr (chip,0 ,0 ,PRO_DATA_COUNT1 ,6 );if (retval !=STATUS_SUCCESS )return STATUS_FAIL ;
@@ -885,7 +885,7 @@ static int ms_read_attribute_info(struct rtsx_chip *chip)int found_sys_info =0 , found_model_name =0 ;#endif - retval =ms_set_rw_reg_addr (chip, Pro_IntReg,2 , Pro_SystemParm,7 ); + retval =ms_set_rw_reg_addr (chip,PRO_INT_REG ,2 ,PRO_SYSTEM_PARAM ,7 );if (retval !=STATUS_SUCCESS )return STATUS_FAIL ;
@@ -1232,7 +1232,7 @@ static int ms_read_status_reg(struct rtsx_chip *chip)int retval;u8 val[2 ]; - retval =ms_set_rw_reg_addr (chip, StatusReg0,2 ,0 ,0 ); + retval =ms_set_rw_reg_addr (chip,STATUS_REG0 ,2 ,0 ,0 );if (retval !=STATUS_SUCCESS )return STATUS_FAIL ;
@@ -1255,8 +1255,8 @@ static int ms_read_extra_data(struct rtsx_chip *chip,int retval, i;u8 val, data[10 ]; - retval =ms_set_rw_reg_addr (chip, OverwriteFlag,MS_EXTRA_SIZE , - SystemParm,6 ); + retval =ms_set_rw_reg_addr (chip,OVERWRITE_FLAG ,MS_EXTRA_SIZE , +SYSTEM_PARAM ,6 );if (retval !=STATUS_SUCCESS )return STATUS_FAIL ;
@@ -1307,8 +1307,8 @@ static int ms_read_extra_data(struct rtsx_chip *chip,if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - retval =ms_set_rw_reg_addr (chip, OverwriteFlag, -MS_EXTRA_SIZE , SystemParm, + retval =ms_set_rw_reg_addr (chip,OVERWRITE_FLAG , +MS_EXTRA_SIZE ,SYSTEM_PARAM ,6 );if (retval !=STATUS_SUCCESS )return STATUS_FAIL ;
@@ -1339,8 +1339,8 @@ static int ms_write_extra_data(struct rtsx_chip *chip, u16 block_addr,if (!buf || (buf_len <MS_EXTRA_SIZE ))return STATUS_FAIL ; - retval =ms_set_rw_reg_addr (chip, OverwriteFlag,MS_EXTRA_SIZE , - SystemParm,6 +MS_EXTRA_SIZE ); + retval =ms_set_rw_reg_addr (chip,OVERWRITE_FLAG ,MS_EXTRA_SIZE , +SYSTEM_PARAM ,6 +MS_EXTRA_SIZE );if (retval !=STATUS_SUCCESS )return STATUS_FAIL ;
@@ -1392,8 +1392,8 @@ static int ms_read_page(struct rtsx_chip *chip, u16 block_addr, u8 page_num)int retval;u8 val, data[6 ]; - retval =ms_set_rw_reg_addr (chip, OverwriteFlag,MS_EXTRA_SIZE , - SystemParm,6 ); + retval =ms_set_rw_reg_addr (chip,OVERWRITE_FLAG ,MS_EXTRA_SIZE , +SYSTEM_PARAM ,6 );if (retval !=STATUS_SUCCESS )return STATUS_FAIL ;
@@ -1465,8 +1465,8 @@ static int ms_set_bad_block(struct rtsx_chip *chip, u16 phy_blk)if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - retval =ms_set_rw_reg_addr (chip, OverwriteFlag,MS_EXTRA_SIZE , - SystemParm,7 ); + retval =ms_set_rw_reg_addr (chip,OVERWRITE_FLAG ,MS_EXTRA_SIZE , +SYSTEM_PARAM ,7 );if (retval !=STATUS_SUCCESS )return STATUS_FAIL ;
@@ -1519,8 +1519,8 @@ static int ms_erase_block(struct rtsx_chip *chip, u16 phy_blk)int retval, i =0 ;u8 val, data[6 ]; - retval =ms_set_rw_reg_addr (chip, OverwriteFlag,MS_EXTRA_SIZE , - SystemParm,6 ); + retval =ms_set_rw_reg_addr (chip,OVERWRITE_FLAG ,MS_EXTRA_SIZE , +SYSTEM_PARAM ,6 );if (retval !=STATUS_SUCCESS )return STATUS_FAIL ;
@@ -1579,7 +1579,7 @@ static void ms_set_page_status(u16 log_blk, u8 type, u8 *extra, int extra_len)memset (extra,0xFF ,MS_EXTRA_SIZE ); -if (type == setPS_NG) { +if (type == set_PS_NG) {/* set page status as 1:NG,and block status keep 1:OK */ extra[0 ] =0xB8 ; }else {
@@ -1670,8 +1670,8 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - retval =ms_set_rw_reg_addr (chip, OverwriteFlag, -MS_EXTRA_SIZE , SystemParm,6 ); + retval =ms_set_rw_reg_addr (chip,OVERWRITE_FLAG , +MS_EXTRA_SIZE ,SYSTEM_PARAM ,6 );if (retval !=STATUS_SUCCESS )return STATUS_FAIL ;
@@ -1725,7 +1725,7 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,return STATUS_FAIL ;if (uncorrect_flag) { -ms_set_page_status (log_blk, setPS_NG, +ms_set_page_status (log_blk, set_PS_NG, extra,MS_EXTRA_SIZE );if (i ==0 )
@@ -1738,8 +1738,8 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk, i, extra[0]);MS_SET_BAD_BLOCK_FLG (ms_card); -ms_set_page_status (log_blk, setPS_Error, - extra, +ms_set_page_status (log_blk, + set_PS_error, extra,MS_EXTRA_SIZE ); ms_write_extra_data(chip, new_blk, i, extra,
@@ -1767,8 +1767,8 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk, } } - retval =ms_set_rw_reg_addr (chip, OverwriteFlag,MS_EXTRA_SIZE , - SystemParm, (6 +MS_EXTRA_SIZE )); + retval =ms_set_rw_reg_addr (chip,OVERWRITE_FLAG ,MS_EXTRA_SIZE , +SYSTEM_PARAM , (6 +MS_EXTRA_SIZE ));ms_set_err_code (chip,MS_NO_ERROR );
@@ -1822,8 +1822,8 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk, }if (i ==0 ) { - retval =ms_set_rw_reg_addr (chip, OverwriteFlag, -MS_EXTRA_SIZE , SystemParm, + retval =ms_set_rw_reg_addr (chip,OVERWRITE_FLAG , +MS_EXTRA_SIZE ,SYSTEM_PARAM ,7 );if (retval !=STATUS_SUCCESS )return STATUS_FAIL ;
@@ -1980,8 +1980,8 @@ static int reset_ms(struct rtsx_chip *chip)for (reg_addr =BLOCK_SIZE_0 ; reg_addr <=PAGE_SIZE_1 ; reg_addr++)rtsx_add_cmd (chip,READ_REG_CMD , reg_addr,0 ,0 ); -rtsx_add_cmd (chip,READ_REG_CMD , MS_Device_Type,0 ,0 ); -rtsx_add_cmd (chip,READ_REG_CMD , MS_4bit_Support,0 ,0 ); +rtsx_add_cmd (chip,READ_REG_CMD , MS_device_type,0 ,0 ); +rtsx_add_cmd (chip,READ_REG_CMD , MS_4bit_support,0 ,0 ); retval =rtsx_send_cmd (chip,MS_CARD ,100 );if (retval <0 )
@@ -2057,7 +2057,7 @@ static int reset_ms(struct rtsx_chip *chip)/* Switch I/F Mode */ if (ptr[15 ]) { - retval =ms_set_rw_reg_addr (chip,0 ,0 , SystemParm,1 ); + retval =ms_set_rw_reg_addr (chip,0 ,0 ,SYSTEM_PARAM ,1 );if (retval !=STATUS_SUCCESS )return STATUS_FAIL ;
@@ -2887,7 +2887,7 @@ int mspro_format(struct scsi_cmnd *srb, struct rtsx_chip *chip,if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - retval =ms_set_rw_reg_addr (chip,0x00 ,0x00 , Pro_TPCParm,0x01 ); + retval =ms_set_rw_reg_addr (chip,0x00 ,0x00 ,PRO_TPC_PARM ,0x01 );if (retval !=STATUS_SUCCESS )return STATUS_FAIL ;
@@ -2970,8 +2970,8 @@ static int ms_read_multiple_pages(struct rtsx_chip *chip, u16 phy_blk, } } - retval =ms_set_rw_reg_addr (chip, OverwriteFlag,MS_EXTRA_SIZE , - SystemParm,6 ); + retval =ms_set_rw_reg_addr (chip,OVERWRITE_FLAG ,MS_EXTRA_SIZE , +SYSTEM_PARAM ,6 );if (retval !=STATUS_SUCCESS )return STATUS_FAIL ;
@@ -3026,7 +3026,7 @@ static int ms_read_multiple_pages(struct rtsx_chip *chip, u16 phy_blk,if (!(chip->card_wp &MS_CARD )) {reset_ms (chip);ms_set_page_status - (log_blk, setPS_NG, + (log_blk, set_PS_NG, extra,MS_EXTRA_SIZE ); ms_write_extra_data
@@ -3131,8 +3131,8 @@ static int ms_write_multiple_pages(struct rtsx_chip *chip, u16 old_blk,u8 *ptr;if (!start_page) { - retval =ms_set_rw_reg_addr (chip, OverwriteFlag,MS_EXTRA_SIZE , - SystemParm,7 ); + retval =ms_set_rw_reg_addr (chip,OVERWRITE_FLAG ,MS_EXTRA_SIZE , +SYSTEM_PARAM ,7 );if (retval !=STATUS_SUCCESS )return STATUS_FAIL ;
@@ -3165,8 +3165,8 @@ static int ms_write_multiple_pages(struct rtsx_chip *chip, u16 old_blk,return STATUS_FAIL ; } - retval =ms_set_rw_reg_addr (chip, OverwriteFlag,MS_EXTRA_SIZE , - SystemParm, (6 +MS_EXTRA_SIZE )); + retval =ms_set_rw_reg_addr (chip,OVERWRITE_FLAG ,MS_EXTRA_SIZE , +SYSTEM_PARAM , (6 +MS_EXTRA_SIZE ));if (retval !=STATUS_SUCCESS )return STATUS_FAIL ;
@@ -3773,9 +3773,9 @@ static int mg_set_tpc_para_sub(struct rtsx_chip *chip, int type,u8 buf[6 ];if (type ==0 ) - retval =ms_set_rw_reg_addr (chip,0 ,0 , Pro_TPCParm,1 ); + retval =ms_set_rw_reg_addr (chip,0 ,0 ,PRO_TPC_PARM ,1 );else - retval =ms_set_rw_reg_addr (chip,0 ,0 , Pro_DataCount1,6 ); + retval =ms_set_rw_reg_addr (chip,0 ,0 ,PRO_DATA_COUNT1 ,6 );if (retval !=STATUS_SUCCESS )return STATUS_FAIL ;
@@ -4154,7 +4154,7 @@ int mg_set_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip) }else {set_sense_type (chip, lun,SENSE_TYPE_MG_WRITE_ERR ); } - goto SetICVFinish; + goto set_ICV_finish; }#ifdef MG_SET_ICV_SLOW
@@ -4195,7 +4195,7 @@ int mg_set_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip) SENSE_TYPE_MG_WRITE_ERR); } retval =STATUS_FAIL ; - goto SetICVFinish; + goto set_ICV_finish; } }#else
@@ -4214,11 +4214,11 @@ int mg_set_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip) } else {set_sense_type (chip, lun,SENSE_TYPE_MG_WRITE_ERR ); } - goto SetICVFinish; + goto set_ICV_finish; }#endif -SetICVFinish: +set_ICV_finish:kfree (buf);return retval; }
drivers/staging/rts5208/ms.h +35 -35
84 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v4 2/3 staging: rts5208: Eliminate the use of Camel Case in files xd.{h,c}
In reply to Gabriela BittencourtCleans up checks of "Avoid CamelCase" in files xd.{h,c}
--- drivers/staging/rts5208/xd.c | 8 ++++---- drivers/staging/rts5208/xd.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-)
drivers/staging/rts5208/xd.c +4 -4
@@ -630,13 +630,13 @@ static int reset_xd(struct rtsx_chip *chip) xd_card->zone_cnt =32 ; xd_card->capacity =1024000 ;break ; -case xD_1G_X8_512: +case XD_1G_X8_512 :XD_PAGE_512 (xd_card); xd_card->addr_cycle =4 ; xd_card->zone_cnt =64 ; xd_card->capacity =2048000 ;break ; -case xD_2G_X8_512: +case XD_2G_X8_512 :XD_PAGE_512 (xd_card); xd_card->addr_cycle =4 ; xd_card->zone_cnt =128 ;
@@ -669,10 +669,10 @@ static int reset_xd(struct rtsx_chip *chip)return STATUS_FAIL ; } - retval =xd_read_id (chip, READ_xD_ID, id_buf,4 ); + retval =xd_read_id (chip,READ_XD_ID , id_buf,4 );if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; -dev_dbg (rtsx_dev (chip),"READ_xD_ID: 0x%x 0x%x 0x%x 0x%x\n" , +dev_dbg (rtsx_dev (chip),"READ_XD_ID: 0x%x 0x%x 0x%x 0x%x\n" , id_buf[0 ], id_buf[1 ], id_buf[2 ], id_buf[3 ]);if (id_buf[2 ] !=XD_ID_CODE )return STATUS_FAIL ;
drivers/staging/rts5208/xd.h +3 -3
@@ -36,7 +36,7 @@#define BLK_ERASE_1 0x60#define BLK_ERASE_2 0xD0#define READ_STS 0x70 -#define READ_xD_ID 0x9A +#define READ_XD_ID 0x9A#define COPY_BACK_512 0x8A#define COPY_BACK_2K 0x85#define READ1_1_2 0x30
@@ -72,8 +72,8 @@#define XD_128M_X16_2048 0xC1#define XD_4M_X8_512_1 0xE3#define XD_4M_X8_512_2 0xE5 -#define xD_1G_X8_512 0xD3 -#define xD_2G_X8_512 0xD5 +#define XD_1G_X8_512 0xD3 +#define XD_2G_X8_512 0xD5#define XD_ID_CODE 0xB5
Signature · 1 line
2.20.1
PATCH v4 3/3 staging: rts5208: Eliminate the use of Camel Case in file sd.h
In reply to Gabriela BittencourtCleans up checks of "Avoid CamelCase" in file sd.h
Even though the constant "DCM_LOW_FREQUENCY_MODE_SET" is defined and never used, it's useful to keep it because it documents the device.
---
Changes in v4:
- Explain the reason of keeping a constant that is defined and not used
--- drivers/staging/rts5208/sd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rts5208/sd.h +1 -1
@@ -232,7 +232,7 @@#define DCM_LOW_FREQUENCY_MODE 0x01#define DCM_HIGH_FREQUENCY_MODE_SET 0x0C -#define DCM_Low_FREQUENCY_MODE_SET 0x00 +#define DCM_LOW_FREQUENCY_MODE_SET 0x00#define MULTIPLY_BY_1 0x00#define MULTIPLY_BY_2 0x01
Signature · 1 line
2.20.1