staging: rts5208: Remove unnecessary braces {}
PATCH 1/1 staging: rts5208: Remove unnecessary braces {}
This patch fixes the checkpatch.pl warning "braces {} are not necessary" in the rts5208 driver. Mostly applies to single-line return/goto if blocks.
Signed-off-by Aymen Qader <[email protected]>
--- drivers/staging/rts5208/ms.c | 619 ++++++++++---------------- drivers/staging/rts5208/rtsx_card.c | 92 ++-- drivers/staging/rts5208/rtsx_card.h | 3 +- drivers/staging/rts5208/rtsx_chip.c | 396 ++++++----------- drivers/staging/rts5208/rtsx_scsi.c | 108 ++--- drivers/staging/rts5208/sd.c | 649 ++++++++++------------------ drivers/staging/rts5208/spi.c | 141 ++---- drivers/staging/rts5208/xd.c | 210 +++------ 8 files changed, 759 insertions(+), 1459 deletions(-)
drivers/staging/rts5208/ms.c +222 -397
@@ -111,9 +111,8 @@ static int ms_transfer_data(struct rtsx_chip *chip, u8 trans_mode,u8 val, err_code =0 ;enum dma_data_direction dir; -if (!buf || !buf_len) { +if (!buf || !buf_len)return STATUS_FAIL ; - }if (trans_mode ==MS_TM_AUTO_READ ) { dir =DMA_FROM_DEVICE ;
@@ -162,12 +161,11 @@ static int ms_transfer_data(struct rtsx_chip *chip, u8 trans_mode, } retval =rtsx_read_register (chip,MS_TRANS_CFG , &val); -if (retval) { +if (retval)return retval; - } -if (val & (MS_INT_CMDNK |MS_INT_ERR |MS_CRC16_ERR |MS_RDY_TIMEOUT )) { + +if (val & (MS_INT_CMDNK |MS_INT_ERR |MS_CRC16_ERR |MS_RDY_TIMEOUT ))return STATUS_FAIL ; - }return STATUS_SUCCESS ; }
@@ -178,9 +176,8 @@ static int ms_write_bytes(struct rtsx_chip *chip,struct ms_info *ms_card = &chip->ms_card;int retval, i; -if (!data || (data_len < cnt)) { +if (!data || (data_len < cnt))return STATUS_ERROR ; - }rtsx_init_cmd (chip);
@@ -244,9 +241,8 @@ static int ms_read_bytes(struct rtsx_chip *chip,int retval, i;u8 *ptr; -if (!data) { +if (!data)return STATUS_ERROR ; - }rtsx_init_cmd (chip);
@@ -371,14 +367,12 @@ static int ms_set_init_para(struct rtsx_chip *chip) } retval =switch_clock (chip, ms_card->ms_clock); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =select_card (chip,MS_CARD ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }return STATUS_SUCCESS ; }
@@ -389,14 +383,12 @@ static int ms_switch_clock(struct rtsx_chip *chip)int retval; retval =select_card (chip,MS_CARD ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =switch_clock (chip, ms_card->ms_clock); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }return STATUS_SUCCESS ; }
@@ -409,60 +401,59 @@ static int ms_pull_ctl_disable(struct rtsx_chip *chip) retval =rtsx_write_register (chip,CARD_PULL_CTL1 ,0xFF ,MS_D1_PD |MS_D2_PD |MS_CLK_PD |MS_D6_PD ); -if (retval) { +if (retval)return retval; - } + retval =rtsx_write_register (chip,CARD_PULL_CTL2 ,0xFF ,MS_D3_PD |MS_D0_PD |MS_BS_PD |XD_D4_PD ); -if (retval) { +if (retval)return retval; - } + retval =rtsx_write_register (chip,CARD_PULL_CTL3 ,0xFF ,MS_D7_PD |XD_CE_PD |XD_CLE_PD |XD_CD_PU ); -if (retval) { +if (retval)return retval; - } + retval =rtsx_write_register (chip,CARD_PULL_CTL4 ,0xFF ,XD_RDY_PD |SD_D3_PD |SD_D2_PD |XD_ALE_PD ); -if (retval) { +if (retval)return retval; - } + retval =rtsx_write_register (chip,CARD_PULL_CTL5 ,0xFF ,MS_INS_PU |SD_WP_PD |SD_CD_PU |SD_CMD_PD ); -if (retval) { +if (retval)return retval; - } + retval =rtsx_write_register (chip,CARD_PULL_CTL6 ,0xFF ,MS_D5_PD |MS_D4_PD ); -if (retval) { +if (retval)return retval; - } + }else if (CHECK_PID (chip,0x5288 )) {if (CHECK_BARO_PKG (chip,QFN )) { retval =rtsx_write_register (chip,CARD_PULL_CTL1 ,0xFF ,0x55 ); -if (retval) { +if (retval)return retval; - } + retval =rtsx_write_register (chip,CARD_PULL_CTL2 ,0xFF ,0x55 ); -if (retval) { +if (retval)return retval; - } + retval =rtsx_write_register (chip,CARD_PULL_CTL3 ,0xFF ,0x4B ); -if (retval) { +if (retval)return retval; - } + retval =rtsx_write_register (chip,CARD_PULL_CTL4 ,0xFF ,0x69 ); -if (retval) { +if (retval)return retval; - } } }
@@ -502,9 +493,8 @@ static int ms_pull_ctl_enable(struct rtsx_chip *chip) } retval =rtsx_send_cmd (chip,MS_CARD ,100 ); -if (retval <0 ) { +if (retval <0 )return STATUS_FAIL ; - }return STATUS_SUCCESS ; }
@@ -523,36 +513,31 @@ static int ms_prepare_reset(struct rtsx_chip *chip) ms_card->pro_under_formatting =0 ; retval =ms_power_off_card3v3 (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }if (!chip->ft2_fast_mode)wait_timeout (250 ); retval =enable_card_clock (chip,MS_CARD ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }if (chip->asic_code) { retval =ms_pull_ctl_enable (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } }else { retval =rtsx_write_register (chip,FPGA_PULL_CTL ,FPGA_MS_PULL_CTL_BIT |0x20 ,0 ); -if (retval) { +if (retval)return retval; - } }if (!chip->ft2_fast_mode) { retval =card_power_on (chip,MS_CARD ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }wait_timeout (150 );
@@ -572,9 +557,8 @@ static int ms_prepare_reset(struct rtsx_chip *chip) retval =rtsx_write_register (chip,CARD_OE ,MS_OUTPUT_EN ,MS_OUTPUT_EN ); -if (retval) { +if (retval)return retval; - }if (chip->asic_code) { retval = rtsx_write_register(chip, MS_CFG, 0xFF,
@@ -582,34 +566,31 @@ static int ms_prepare_reset(struct rtsx_chip *chip)PUSH_TIME_DEFAULT |NO_EXTEND_TOGGLE | MS_BUS_WIDTH_1); -if (retval) { +if (retval)return retval; - } + }else { retval =rtsx_write_register (chip,MS_CFG ,0xFF ,SAMPLE_TIME_FALLING |PUSH_TIME_DEFAULT |NO_EXTEND_TOGGLE |MS_BUS_WIDTH_1 ); -if (retval) { +if (retval)return retval; - } } retval =rtsx_write_register (chip,MS_TRANS_CFG ,0xFF ,NO_WAIT_INT |NO_AUTO_READ_INT_REG ); -if (retval) { +if (retval)return retval; - } + retval =rtsx_write_register (chip,CARD_STOP ,MS_STOP |MS_CLR_ERR ,MS_STOP |MS_CLR_ERR ); -if (retval) { +if (retval)return retval; - } retval =ms_set_init_para (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }return STATUS_SUCCESS ; }
@@ -621,9 +602,8 @@ static int ms_identify_media_type(struct rtsx_chip *chip, int switch_8bit_bus)u8 val; retval =ms_set_rw_reg_addr (chip, Pro_StatusReg,6 , SystemParm,1 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }for (i =0 ; i <MS_MAX_RETRY_COUNT ; i++) { retval = ms_transfer_tpc(chip, MS_TM_READ_BYTES, READ_REG,
@@ -631,14 +611,13 @@ static int ms_identify_media_type(struct rtsx_chip *chip, int switch_8bit_bus)if (retval ==STATUS_SUCCESS )break ; } -if (i ==MS_MAX_RETRY_COUNT ) { +if (i ==MS_MAX_RETRY_COUNT )return STATUS_FAIL ; - } retval =rtsx_read_register (chip,PPBUF_BASE2 +2 , &val); -if (retval) { +if (retval)return retval; - } +dev_dbg (rtsx_dev (chip),"Type register: 0x%x\n" , val);if (val !=0x01 ) {if (val !=0x02 )
@@ -648,9 +627,9 @@ static int ms_identify_media_type(struct rtsx_chip *chip, int switch_8bit_bus) } retval =rtsx_read_register (chip,PPBUF_BASE2 +4 , &val); -if (retval) { +if (retval)return retval; - } +dev_dbg (rtsx_dev (chip),"Category register: 0x%x\n" , val);if (val !=0 ) { ms_card->check_ms_flow =1 ;
@@ -658,15 +637,15 @@ static int ms_identify_media_type(struct rtsx_chip *chip, int switch_8bit_bus) } retval =rtsx_read_register (chip,PPBUF_BASE2 +5 , &val); -if (retval) { +if (retval)return retval; - } +dev_dbg (rtsx_dev (chip),"Class register: 0x%x\n" , val);if (val ==0 ) { retval =rtsx_read_register (chip,PPBUF_BASE2 , &val); -if (retval) { +if (retval)return retval; - } +if (val &WRT_PRTCT ) chip->card_wp |=MS_CARD ;else
@@ -682,9 +661,9 @@ static int ms_identify_media_type(struct rtsx_chip *chip, int switch_8bit_bus) ms_card->ms_type |=TYPE_MSPRO ; retval =rtsx_read_register (chip,PPBUF_BASE2 +3 , &val); -if (retval) { +if (retval)return retval; - } +dev_dbg (rtsx_dev (chip),"IF Mode register: 0x%x\n" , val);if (val ==0 ) { ms_card->ms_type &=0x0F ;
@@ -720,13 +699,11 @@ static int ms_confirm_cpu_startup(struct rtsx_chip *chip)if (retval ==STATUS_SUCCESS )break ; } -if (i ==MS_MAX_RETRY_COUNT ) { +if (i ==MS_MAX_RETRY_COUNT )return STATUS_FAIL ; - } -if (k >100 ) { +if (k >100 )return STATUS_FAIL ; - } k++;wait_timeout (100 );
@@ -737,16 +714,14 @@ static int ms_confirm_cpu_startup(struct rtsx_chip *chip)if (retval ==STATUS_SUCCESS )break ; } -if (i ==MS_MAX_RETRY_COUNT ) { +if (i ==MS_MAX_RETRY_COUNT )return STATUS_FAIL ; - }if (val &INT_REG_ERR ) { -if (val &INT_REG_CMDNK ) { +if (val &INT_REG_CMDNK ) chip->card_wp |= (MS_CARD ); - }else { +else return STATUS_FAIL ; - } }/* -- end confirm CPU startup */
@@ -766,9 +741,8 @@ static int ms_switch_parallel_bus(struct rtsx_chip *chip)if (retval ==STATUS_SUCCESS )break ; } -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }return STATUS_SUCCESS ; }
@@ -787,27 +761,24 @@ static int ms_switch_8bit_bus(struct rtsx_chip *chip)if (retval ==STATUS_SUCCESS )break ; } -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =rtsx_write_register (chip,MS_CFG ,0x98 ,MS_BUS_WIDTH_8 |SAMPLE_TIME_FALLING ); -if (retval) { +if (retval)return retval; - } + ms_card->ms_type |=MS_8BIT ; retval =ms_set_init_para (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }for (i =0 ; i <MS_MAX_RETRY_COUNT ; i++) { retval =ms_transfer_tpc (chip,MS_TM_READ_BYTES ,GET_INT ,1 ,NO_WAIT_INT ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } }return STATUS_SUCCESS ;
@@ -820,19 +791,16 @@ static int ms_pro_reset_flow(struct rtsx_chip *chip, int switch_8bit_bus)for (i =0 ; i <3 ; i++) { retval =ms_prepare_reset (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =ms_identify_media_type (chip, switch_8bit_bus); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =ms_confirm_cpu_startup (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =ms_switch_parallel_bus (chip);if (retval !=STATUS_SUCCESS ) {
@@ -846,25 +814,22 @@ static int ms_pro_reset_flow(struct rtsx_chip *chip, int switch_8bit_bus) } } -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }/* Switch MS-PRO into Parallel mode */ retval =rtsx_write_register (chip,MS_CFG ,0x18 ,MS_BUS_WIDTH_4 ); -if (retval) { +if (retval)return retval; - } + retval =rtsx_write_register (chip,MS_CFG ,PUSH_TIME_ODD ,PUSH_TIME_ODD ); -if (retval) { +if (retval)return retval; - } retval =ms_set_init_para (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }/* If MSPro HG Card, We shall try to switch to 8-bit bus */ if (CHK_MSHG (ms_card) && chip->support_ms_8bit && switch_8bit_bus) {
@@ -887,9 +852,8 @@ 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 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } buf[0 ] =0 ; buf[1 ] = mode;
@@ -899,22 +863,19 @@ static int msxc_change_power(struct rtsx_chip *chip, u8 mode) buf[5 ] =0 ; retval =ms_write_bytes (chip,PRO_WRITE_REG ,6 ,NO_WAIT_INT , buf,6 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =ms_send_cmd (chip,XC_CHG_POWER ,WAIT_INT ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =rtsx_read_register (chip,MS_TRANS_CFG , buf); -if (retval) { +if (retval)return retval; - } -if (buf[0 ] & (MS_INT_CMDNK |MS_INT_ERR )) { + +if (buf[0 ] & (MS_INT_CMDNK |MS_INT_ERR ))return STATUS_FAIL ; - }return STATUS_SUCCESS ; }
@@ -936,9 +897,8 @@ static int ms_read_attribute_info(struct rtsx_chip *chip)#endif retval =ms_set_rw_reg_addr (chip, Pro_IntReg,2 , Pro_SystemParm,7 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }if (CHK_MS8BIT (ms_card)) data[0 ] =PARALLEL_8BIT_IF ;
@@ -960,14 +920,12 @@ static int ms_read_attribute_info(struct rtsx_chip *chip)if (retval ==STATUS_SUCCESS )break ; } -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } buf =kmalloc (64 *512 ,GFP_KERNEL ); -if (!buf) { +if (!buf)return STATUS_ERROR ; - }for (i =0 ; i <MS_MAX_RETRY_COUNT ; i++) { retval =ms_send_cmd (chip,PRO_READ_ATRB ,WAIT_INT );
@@ -1150,18 +1108,15 @@ static int ms_read_attribute_info(struct rtsx_chip *chip)#ifdef SUPPORT_MSXC if (CHK_MSXC (ms_card)) { -if (class_code !=0x03 ) { +if (class_code !=0x03 )return STATUS_FAIL ; - } }else { -if (class_code !=0x02 ) { +if (class_code !=0x02 )return STATUS_FAIL ; - } }#else -if (class_code !=0x02 ) { +if (class_code !=0x02 )return STATUS_FAIL ; - }#endif if (device_type !=0x00 ) {
@@ -1173,9 +1128,8 @@ static int ms_read_attribute_info(struct rtsx_chip *chip) } } -if (sub_class &0xC0 ) { +if (sub_class &0xC0 )return STATUS_FAIL ; - }dev_dbg (rtsx_dev (chip),"class_code: 0x%x, device_type: 0x%x, sub_class: 0x%x\n" , class_code, device_type, sub_class);
@@ -1223,18 +1177,16 @@ static int reset_ms_pro(struct rtsx_chip *chip)if (retval !=STATUS_SUCCESS ) {if (ms_card->switch_8bit_fail) { retval =ms_pro_reset_flow (chip,0 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } }else {return STATUS_FAIL ; } } retval =ms_read_attribute_info (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }#ifdef XC_POWERCLASS if (CHK_HG8BIT (ms_card))
@@ -1274,9 +1226,8 @@ static int reset_ms_pro(struct rtsx_chip *chip)#ifdef SUPPORT_MAGIC_GATE retval =mg_set_tpc_para_sub (chip,0 ,0 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }#endif if (CHK_HG8BIT (ms_card))
@@ -1293,14 +1244,12 @@ static int ms_read_status_reg(struct rtsx_chip *chip)u8 val[2 ]; retval =ms_set_rw_reg_addr (chip, StatusReg0,2 ,0 ,0 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =ms_read_bytes (chip,READ_REG ,2 ,NO_WAIT_INT , val,2 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }if (val[1 ] & (STS_UCDT |STS_UCEX |STS_UCFG )) {ms_set_err_code (chip,MS_FLASH_READ_ERROR );
@@ -1319,9 +1268,8 @@ static int ms_read_extra_data(struct rtsx_chip *chip, retval =ms_set_rw_reg_addr (chip, OverwriteFlag,MS_EXTRA_SIZE , SystemParm,6 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }if (CHK_MS4BIT (ms_card)) {/* Parallel interface */
@@ -1342,9 +1290,8 @@ static int ms_read_extra_data(struct rtsx_chip *chip,if (retval ==STATUS_SUCCESS )break ; } -if (i ==MS_MAX_RETRY_COUNT ) { +if (i ==MS_MAX_RETRY_COUNT )return STATUS_FAIL ; - }ms_set_err_code (chip,MS_NO_ERROR );
@@ -1353,15 +1300,13 @@ static int ms_read_extra_data(struct rtsx_chip *chip,if (retval ==STATUS_SUCCESS )break ; } -if (i ==MS_MAX_RETRY_COUNT ) { +if (i ==MS_MAX_RETRY_COUNT )return STATUS_FAIL ; - }ms_set_err_code (chip,MS_NO_ERROR ); retval =ms_read_bytes (chip,GET_INT ,1 ,NO_WAIT_INT , &val,1 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }if (val &INT_REG_CMDNK ) {ms_set_err_code (chip,MS_CMD_NK );
@@ -1370,24 +1315,21 @@ static int ms_read_extra_data(struct rtsx_chip *chip,if (val &INT_REG_CED ) {if (val &INT_REG_ERR ) { retval =ms_read_status_reg (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =ms_set_rw_reg_addr (chip, OverwriteFlag,MS_EXTRA_SIZE , SystemParm,6 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } } } retval =ms_read_bytes (chip,READ_REG ,MS_EXTRA_SIZE ,NO_WAIT_INT , data,MS_EXTRA_SIZE ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }if (buf && buf_len) {if (buf_len >MS_EXTRA_SIZE )
@@ -1405,15 +1347,13 @@ static int ms_write_extra_data(struct rtsx_chip *chip, u16 block_addr,int retval, i;u8 val, data[16 ]; -if (!buf || (buf_len <MS_EXTRA_SIZE )) { +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 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }if (CHK_MS4BIT (ms_card)) data[0 ] =0x88 ;
@@ -1431,20 +1371,17 @@ static int ms_write_extra_data(struct rtsx_chip *chip, u16 block_addr, retval =ms_write_bytes (chip,WRITE_REG , (6 +MS_EXTRA_SIZE ),NO_WAIT_INT , data,16 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =ms_send_cmd (chip,BLOCK_WRITE ,WAIT_INT ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }ms_set_err_code (chip,MS_NO_ERROR ); retval =ms_read_bytes (chip,GET_INT ,1 ,NO_WAIT_INT , &val,1 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }if (val &INT_REG_CMDNK ) {ms_set_err_code (chip,MS_CMD_NK );
@@ -1468,9 +1405,8 @@ static int ms_read_page(struct rtsx_chip *chip, u16 block_addr, u8 page_num) retval =ms_set_rw_reg_addr (chip, OverwriteFlag,MS_EXTRA_SIZE , SystemParm,6 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }if (CHK_MS4BIT (ms_card)) data[0 ] =0x88 ;
@@ -1484,20 +1420,17 @@ static int ms_read_page(struct rtsx_chip *chip, u16 block_addr, u8 page_num) data[5 ] = page_num; retval =ms_write_bytes (chip,WRITE_REG ,6 ,NO_WAIT_INT , data,6 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =ms_send_cmd (chip,BLOCK_READ ,WAIT_INT ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }ms_set_err_code (chip,MS_NO_ERROR ); retval =ms_read_bytes (chip,GET_INT ,1 ,NO_WAIT_INT , &val,1 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }if (val &INT_REG_CMDNK ) {ms_set_err_code (chip,MS_CMD_NK );
@@ -1524,13 +1457,11 @@ static int ms_read_page(struct rtsx_chip *chip, u16 block_addr, u8 page_num) retval =ms_transfer_tpc (chip,MS_TM_NORMAL_READ ,READ_PAGE_DATA ,0 ,NO_WAIT_INT ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } -if (ms_check_err_code (chip,MS_FLASH_WRITE_ERROR )) { +if (ms_check_err_code (chip,MS_FLASH_WRITE_ERROR ))return STATUS_FAIL ; - }return STATUS_SUCCESS ; }
@@ -1542,15 +1473,13 @@ static int ms_set_bad_block(struct rtsx_chip *chip, u16 phy_blk)u8 val, data[8 ], extra[MS_EXTRA_SIZE ]; retval =ms_read_extra_data (chip, phy_blk,0 , extra,MS_EXTRA_SIZE ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =ms_set_rw_reg_addr (chip, OverwriteFlag,MS_EXTRA_SIZE , SystemParm,7 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }ms_set_err_code (chip,MS_NO_ERROR );
@@ -1568,20 +1497,17 @@ static int ms_set_bad_block(struct rtsx_chip *chip, u16 phy_blk) data[7 ] =0xFF ; retval =ms_write_bytes (chip,WRITE_REG ,7 ,NO_WAIT_INT , data,7 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =ms_send_cmd (chip,BLOCK_WRITE ,WAIT_INT ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }ms_set_err_code (chip,MS_NO_ERROR ); retval =ms_read_bytes (chip,GET_INT ,1 ,NO_WAIT_INT , &val,1 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }if (val &INT_REG_CMDNK ) {ms_set_err_code (chip,MS_CMD_NK );
@@ -1606,9 +1532,8 @@ static int ms_erase_block(struct rtsx_chip *chip, u16 phy_blk) retval =ms_set_rw_reg_addr (chip, OverwriteFlag,MS_EXTRA_SIZE , SystemParm,6 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }ms_set_err_code (chip,MS_NO_ERROR );
@@ -1624,21 +1549,18 @@ static int ms_erase_block(struct rtsx_chip *chip, u16 phy_blk) data[5 ] =0 ; retval =ms_write_bytes (chip,WRITE_REG ,6 ,NO_WAIT_INT , data,6 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } ERASE_RTY: retval =ms_send_cmd (chip,BLOCK_ERASE ,WAIT_INT ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }ms_set_err_code (chip,MS_NO_ERROR ); retval =ms_read_bytes (chip,GET_INT ,1 ,NO_WAIT_INT , &val,1 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }if (val &INT_REG_CMDNK ) {if (i <3 ) {
@@ -1701,9 +1623,8 @@ static int ms_init_page(struct rtsx_chip *chip, u16 phy_blk, u16 log_blk, retval =ms_write_extra_data (chip, phy_blk, i, extra,MS_EXTRA_SIZE ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } }return STATUS_SUCCESS ;
@@ -1723,30 +1644,25 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk, start_page, end_page); retval =ms_read_extra_data (chip, new_blk,0 , extra,MS_EXTRA_SIZE ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =ms_read_status_reg (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =rtsx_read_register (chip,PPBUF_BASE2 , &val); -if (retval) { +if (retval)return retval; - }if (val &BUF_FULL ) { retval =ms_send_cmd (chip,CLEAR_BUF ,WAIT_INT ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =ms_read_bytes (chip,GET_INT ,1 ,NO_WAIT_INT , &val,1 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }if (!(val &INT_REG_CED )) {ms_set_err_code (chip,MS_FLASH_WRITE_ERROR );
@@ -1764,9 +1680,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 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }ms_set_err_code (chip,MS_NO_ERROR );
@@ -1783,20 +1698,17 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk, retval =ms_write_bytes (chip,WRITE_REG ,6 ,NO_WAIT_INT , data,6 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =ms_send_cmd (chip,BLOCK_READ ,WAIT_INT ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }ms_set_err_code (chip,MS_NO_ERROR ); retval =ms_read_bytes (chip,GET_INT ,1 ,NO_WAIT_INT , &val,1 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }if (val &INT_REG_CMDNK ) {ms_set_err_code (chip,MS_CMD_NK );
@@ -1817,9 +1729,8 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,MS_TM_NORMAL_READ ,READ_PAGE_DATA , 0, NO_WAIT_INT); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }if (uncorrect_flag) { ms_set_page_status(log_blk, setPS_NG,
@@ -1854,9 +1765,8 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,if (retval ==STATUS_SUCCESS )break ; } -if (rty_cnt ==MS_MAX_RETRY_COUNT ) { +if (rty_cnt ==MS_MAX_RETRY_COUNT )return STATUS_FAIL ; - } }if (!(val &INT_REG_BREQ )) {
@@ -1895,20 +1805,17 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk, retval =ms_write_bytes (chip,WRITE_REG , (6 +MS_EXTRA_SIZE ),NO_WAIT_INT , data,16 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =ms_send_cmd (chip,BLOCK_WRITE ,WAIT_INT ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }ms_set_err_code (chip,MS_NO_ERROR ); retval =ms_read_bytes (chip,GET_INT ,1 ,NO_WAIT_INT , &val,1 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }if (val &INT_REG_CMDNK ) {ms_set_err_code (chip,MS_CMD_NK );
@@ -1926,9 +1833,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,7 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }ms_set_err_code (chip,MS_NO_ERROR );
@@ -1947,21 +1853,18 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk, retval =ms_write_bytes (chip,WRITE_REG ,7 ,NO_WAIT_INT , data,8 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =ms_send_cmd (chip,BLOCK_WRITE ,WAIT_INT ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }ms_set_err_code (chip,MS_NO_ERROR ); retval =ms_read_bytes (chip,GET_INT ,1 ,NO_WAIT_INT , &val,1 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }if (val &INT_REG_CMDNK ) {ms_set_err_code (chip,MS_CMD_NK );
@@ -1992,26 +1895,23 @@ static int reset_ms(struct rtsx_chip *chip)#endif retval =ms_prepare_reset (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } ms_card->ms_type |=TYPE_MS ; retval =ms_send_cmd (chip,MS_RESET ,NO_WAIT_INT ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =ms_read_status_reg (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =rtsx_read_register (chip,PPBUF_BASE2 , &val); -if (retval) { +if (retval)return retval; - } +if (val &WRT_PRTCT ) chip->card_wp |=MS_CARD ;else
@@ -2059,9 +1959,8 @@ static int reset_ms(struct rtsx_chip *chip) } retval =ms_read_page (chip, ms_card->boot_block,0 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }/* Read MS system information as sys_info */ rtsx_init_cmd (chip);
@@ -2070,9 +1969,8 @@ static int reset_ms(struct rtsx_chip *chip)rtsx_add_cmd (chip,READ_REG_CMD ,PPBUF_BASE2 +0x1A0 + i,0 ,0 ); retval =rtsx_send_cmd (chip,MS_CARD ,100 ); -if (retval <0 ) { +if (retval <0 )return STATUS_FAIL ; - } ptr =rtsx_get_cmd_data (chip);memcpy (ms_card->raw_sys_info, ptr,96 );
@@ -2094,9 +1992,8 @@ static int reset_ms(struct rtsx_chip *chip)rtsx_add_cmd (chip,READ_REG_CMD , MS_4bit_Support,0 ,0 ); retval =rtsx_send_cmd (chip,MS_CARD ,100 ); -if (retval <0 ) { +if (retval <0 )return STATUS_FAIL ; - } ptr =rtsx_get_cmd_data (chip);
@@ -2169,33 +2066,29 @@ 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 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =rtsx_write_register (chip,PPBUF_BASE2 ,0xFF ,0x88 ); -if (retval) { +if (retval)return retval; - } + retval =rtsx_write_register (chip,PPBUF_BASE2 +1 ,0xFF ,0 ); -if (retval) { +if (retval)return retval; - } retval =ms_transfer_tpc (chip,MS_TM_WRITE_BYTES ,WRITE_REG ,1 ,NO_WAIT_INT ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =rtsx_write_register (chip,MS_CFG ,0x58 |MS_NO_CHECK_INT ,MS_BUS_WIDTH_4 |PUSH_TIME_ODD |MS_NO_CHECK_INT ); -if (retval) { +if (retval)return retval; - } ms_card->ms_type |=MS_4BIT ; }
@@ -2221,28 +2114,24 @@ static int ms_init_l2p_tbl(struct rtsx_chip *chip) size = ms_card->segment_cnt *sizeof (struct zone_entry ); ms_card->segment =vzalloc (size); -if (!ms_card->segment) { +if (!ms_card->segment)return STATUS_FAIL ; - } retval =ms_read_page (chip, ms_card->boot_block,1 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS ) goto INIT_FAIL; - } reg_addr =PPBUF_BASE2 ;for (i =0 ; i < (((ms_card->total_block >>9 ) *10 ) +1 ); i++) {int block_no; retval =rtsx_read_register (chip, reg_addr++, &val1); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS ) goto INIT_FAIL; - } retval =rtsx_read_register (chip, reg_addr++, &val2); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS ) goto INIT_FAIL; - } defect_block = ((u16 )val1 <<8 ) | val2;if (defect_block ==0xFFFF )
@@ -2403,9 +2292,8 @@ static int ms_build_l2p_tbl(struct rtsx_chip *chip, int seg_no)if (!ms_card->segment) { retval =ms_init_l2p_tbl (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return retval; - } }if (ms_card->segment[seg_no].build_flag) {
@@ -2423,17 +2311,15 @@ static int ms_build_l2p_tbl(struct rtsx_chip *chip, int seg_no)if (!segment->l2p_table) { segment->l2p_table =vmalloc (array_size (table_size,2 )); -if (!segment->l2p_table) { +if (!segment->l2p_table) goto BUILD_FAIL; - } }memset ((u8 *)(segment->l2p_table),0xff , table_size *2 );if (!segment->free_table) { segment->free_table =vmalloc (MS_FREE_TABLE_CNT *2 ); -if (!segment->free_table) { +if (!segment->free_table) goto BUILD_FAIL; - } }memset ((u8 *)(segment->free_table),0xff ,MS_FREE_TABLE_CNT *2 );
@@ -2558,9 +2444,8 @@ static int ms_build_l2p_tbl(struct rtsx_chip *chip, int seg_no)return STATUS_SUCCESS ; } retval =ms_init_page (chip, phy_blk, log_blk,0 ,1 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS ) goto BUILD_FAIL; - } segment->l2p_table[idx] = phy_blk;if (seg_no == ms_card->segment_cnt -1 ) {
@@ -2591,16 +2476,14 @@ static int ms_build_l2p_tbl(struct rtsx_chip *chip, int seg_no) retval =ms_copy_page (chip, tmp_blk, phy_blk, log_blk,0 , ms_card->page_off +1 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } segment->l2p_table[log_blk] = phy_blk; retval =ms_set_bad_block (chip, tmp_blk); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } } } }
@@ -2626,14 +2509,12 @@ int reset_ms_card(struct rtsx_chip *chip)memset (ms_card,0 ,sizeof (struct ms_info )); retval =enable_card_clock (chip,MS_CARD ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =select_card (chip,MS_CARD ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } ms_card->ms_type =0 ;
@@ -2641,27 +2522,24 @@ int reset_ms_card(struct rtsx_chip *chip)if (retval !=STATUS_SUCCESS ) {if (ms_card->check_ms_flow) { retval =reset_ms (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } }else {return STATUS_FAIL ; } } retval =ms_set_init_para (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }if (!CHK_MSPRO (ms_card)) {/* Build table for the last segment, * to check if L2P table block exists, erasing it */ retval =ms_build_l2p_tbl (chip, seg_no); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } }dev_dbg (rtsx_dev (chip),"ms_card->ms_type = 0x%x\n" , ms_card->ms_type);
@@ -2690,9 +2568,8 @@ static int mspro_set_rw_cmd(struct rtsx_chip *chip,if (retval ==STATUS_SUCCESS )break ; } -if (i ==MS_MAX_RETRY_COUNT ) { +if (i ==MS_MAX_RETRY_COUNT )return STATUS_FAIL ; - }return STATUS_SUCCESS ; }
@@ -2731,9 +2608,8 @@ static inline int ms_auto_tune_clock(struct rtsx_chip *chip) } retval =ms_switch_clock (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }return STATUS_SUCCESS ; }
@@ -2782,9 +2658,8 @@ static int mspro_rw_multi_sector(struct scsi_cmnd *srb, } retval =ms_switch_clock (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }if (srb->sc_data_direction ==DMA_FROM_DEVICE ) trans_mode =MS_TM_AUTO_READ ;
@@ -2792,9 +2667,8 @@ static int mspro_rw_multi_sector(struct scsi_cmnd *srb, trans_mode =MS_TM_AUTO_WRITE ; retval =rtsx_read_register (chip,MS_TRANS_CFG , &val); -if (retval) { +if (retval)return retval; - }if (ms_card->seq_mode) { if ((ms_card->pre_dir != srb->sc_data_direction) ||
@@ -2808,9 +2682,8 @@ static int mspro_rw_multi_sector(struct scsi_cmnd *srb, ms_card->total_sec_cnt =0 ;if (val &MS_INT_BREQ ) { retval =ms_send_cmd (chip,PRO_STOP ,WAIT_INT ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }rtsx_write_register (chip,RBCTL ,RB_FLUSH ,RB_FLUSH );
@@ -3019,14 +2892,12 @@ int mspro_format(struct scsi_cmnd *srb, struct rtsx_chip *chip,u16 para; retval =ms_switch_clock (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =ms_set_rw_reg_addr (chip,0x00 ,0x00 , Pro_TPCParm,0x01 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }memset (buf,0 ,2 );switch (short_data_len) {
@@ -3051,9 +2922,8 @@ int mspro_format(struct scsi_cmnd *srb, struct rtsx_chip *chip,if (retval ==STATUS_SUCCESS )break ; } -if (i ==MS_MAX_RETRY_COUNT ) { +if (i ==MS_MAX_RETRY_COUNT )return STATUS_FAIL ; - }if (quick_format) para =0x0000 ;
@@ -3061,18 +2931,15 @@ int mspro_format(struct scsi_cmnd *srb, struct rtsx_chip *chip, para =0x0001 ; retval =mspro_set_rw_cmd (chip,0 , para,PRO_FORMAT ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =rtsx_read_register (chip,MS_TRANS_CFG , &tmp); -if (retval) { +if (retval)return retval; - } -if (tmp & (MS_INT_CMDNK |MS_INT_ERR )) { +if (tmp & (MS_INT_CMDNK |MS_INT_ERR ))return STATUS_FAIL ; - }if ((tmp & (MS_INT_BREQ |MS_INT_CED )) ==MS_INT_BREQ ) { ms_card->pro_under_formatting =1 ;
@@ -3113,9 +2980,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 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }if (CHK_MS4BIT (ms_card)) data[0 ] =0x88 ;
@@ -3134,16 +3000,14 @@ static int ms_read_multiple_pages(struct rtsx_chip *chip, u16 phy_blk,if (retval ==STATUS_SUCCESS )break ; } -if (i ==MS_MAX_RETRY_COUNT ) { +if (i ==MS_MAX_RETRY_COUNT )return STATUS_FAIL ; - }ms_set_err_code (chip,MS_NO_ERROR ); retval =ms_send_cmd (chip,BLOCK_READ ,WAIT_INT ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } ptr = buf;
@@ -3156,9 +3020,8 @@ static int ms_read_multiple_pages(struct rtsx_chip *chip, u16 phy_blk, } retval =ms_read_bytes (chip,GET_INT ,1 ,NO_WAIT_INT , &val,1 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }if (val &INT_REG_CMDNK ) {ms_set_err_code (chip,MS_CMD_NK );
@@ -3197,16 +3060,14 @@ static int ms_read_multiple_pages(struct rtsx_chip *chip, u16 phy_blk,if (page_addr == (end_page -1 )) {if (!(val &INT_REG_CED )) { retval =ms_send_cmd (chip,BLOCK_END ,WAIT_INT ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } } retval =ms_read_bytes (chip,GET_INT ,1 ,NO_WAIT_INT , &val,1 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }if (!(val &INT_REG_CED )) {ms_set_err_code (chip,MS_FLASH_READ_ERROR );
@@ -3280,9 +3141,8 @@ static int ms_write_multiple_pages(struct rtsx_chip *chip, u16 old_blk,if (!start_page) { retval =ms_set_rw_reg_addr (chip, OverwriteFlag,MS_EXTRA_SIZE , SystemParm,7 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }if (CHK_MS4BIT (ms_card)) data[0 ] =0x88 ;
@@ -3299,28 +3159,24 @@ static int ms_write_multiple_pages(struct rtsx_chip *chip, u16 old_blk, retval =ms_write_bytes (chip,WRITE_REG ,7 ,NO_WAIT_INT , data,8 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =ms_send_cmd (chip,BLOCK_WRITE ,WAIT_INT ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }ms_set_err_code (chip,MS_NO_ERROR ); retval =ms_transfer_tpc (chip,MS_TM_READ_BYTES ,GET_INT ,1 ,NO_WAIT_INT ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } } retval =ms_set_rw_reg_addr (chip, OverwriteFlag,MS_EXTRA_SIZE , SystemParm, (6 +MS_EXTRA_SIZE )); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }ms_set_err_code (chip,MS_NO_ERROR );
@@ -3352,23 +3208,20 @@ static int ms_write_multiple_pages(struct rtsx_chip *chip, u16 old_blk,if (retval ==STATUS_SUCCESS )break ; } -if (i ==MS_MAX_RETRY_COUNT ) { +if (i ==MS_MAX_RETRY_COUNT )return STATUS_FAIL ; - }for (i =0 ; i <MS_MAX_RETRY_COUNT ; i++) { retval =ms_send_cmd (chip,BLOCK_WRITE ,WAIT_INT );if (retval ==STATUS_SUCCESS )break ; } -if (i ==MS_MAX_RETRY_COUNT ) { +if (i ==MS_MAX_RETRY_COUNT )return STATUS_FAIL ; - } retval =ms_read_bytes (chip,GET_INT ,1 ,NO_WAIT_INT , &val,1 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } ptr = buf;for (page_addr = start_page; page_addr < end_page; page_addr++) {
@@ -3421,16 +3274,14 @@ static int ms_write_multiple_pages(struct rtsx_chip *chip, u16 old_blk,ms_set_err_code (chip,MS_TO_ERROR );rtsx_clear_ms_error (chip); -if (retval == -ETIMEDOUT ) { +if (retval == -ETIMEDOUT )return STATUS_TIMEDOUT ; - }return STATUS_FAIL ; } retval =ms_read_bytes (chip,GET_INT ,1 ,NO_WAIT_INT , &val,1 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }if ((end_page - start_page) ==1 ) {if (!(val &INT_REG_CED )) {
@@ -3442,16 +3293,14 @@ static int ms_write_multiple_pages(struct rtsx_chip *chip, u16 old_blk,if (!(val &INT_REG_CED )) { retval =ms_send_cmd (chip,BLOCK_END ,WAIT_INT ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } } retval =ms_read_bytes (chip,GET_INT ,1 ,NO_WAIT_INT , &val,1 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } } if ((page_addr == (end_page - 1)) ||
@@ -3479,9 +3328,8 @@ static int ms_finish_write(struct rtsx_chip *chip, u16 old_blk, u16 new_blk, retval =ms_copy_page (chip, old_blk, new_blk, log_blk, page_off, ms_card->page_off +1 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } seg_no = old_blk >>9 ;
@@ -3507,9 +3355,8 @@ static int ms_prepare_write(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,if (start_page) { retval =ms_copy_page (chip, old_blk, new_blk, log_blk,0 , start_page); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } }return STATUS_SUCCESS ;
@@ -3524,9 +3371,8 @@ int ms_delay_write(struct rtsx_chip *chip)if (delay_write->delay_write_flag) { retval =ms_set_init_para (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } delay_write->delay_write_flag =0 ; retval = ms_finish_write(chip,
@@ -3534,9 +3380,8 @@ int ms_delay_write(struct rtsx_chip *chip) delay_write->new_phyblock, delay_write->logblock, delay_write->pageoff); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } }return STATUS_SUCCESS ;
@@ -3850,14 +3695,12 @@ static int ms_poll_int(struct rtsx_chip *chip)rtsx_add_cmd (chip,CHECK_REG_CMD ,MS_TRANS_CFG ,MS_INT_CED ,MS_INT_CED ); retval =rtsx_send_cmd (chip,MS_CARD ,5000 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } val = *rtsx_get_cmd_data (chip); -if (val &MS_INT_ERR ) { +if (val &MS_INT_ERR )return STATUS_FAIL ; - }return STATUS_SUCCESS ; }
@@ -3920,9 +3763,8 @@ static int mg_send_ex_cmd(struct rtsx_chip *chip, u8 cmd, u8 entry_num)if (retval ==STATUS_SUCCESS )break ; } -if (i ==MS_MAX_RETRY_COUNT ) { +if (i ==MS_MAX_RETRY_COUNT )return STATUS_FAIL ; - }if (check_ms_err (chip)) {rtsx_clear_ms_error (chip);
@@ -3943,9 +3785,8 @@ static int mg_set_tpc_para_sub(struct rtsx_chip *chip, int type,else retval =ms_set_rw_reg_addr (chip,0 ,0 , Pro_DataCount1,6 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } buf[0 ] =0 ; buf[1 ] =0 ;
@@ -3957,9 +3798,8 @@ static int mg_set_tpc_para_sub(struct rtsx_chip *chip, int type, } retval =ms_write_bytes (chip,PRO_WRITE_REG , (type ==0 ) ?1 :6 ,NO_WAIT_INT , buf,6 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }return STATUS_SUCCESS ; }
@@ -3979,9 +3819,8 @@ int mg_set_leaf_id(struct scsi_cmnd *srb, struct rtsx_chip *chip)ms_cleanup_work (chip); retval =ms_switch_clock (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =mg_send_ex_cmd (chip,MG_SET_LID ,0 );if (retval !=STATUS_SUCCESS ) {
@@ -4019,14 +3858,12 @@ int mg_get_local_EKB(struct scsi_cmnd *srb, struct rtsx_chip *chip)ms_cleanup_work (chip); retval =ms_switch_clock (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } buf =kmalloc (1540 ,GFP_KERNEL ); -if (!buf) { +if (!buf)return STATUS_ERROR ; - } buf[0 ] =0x04 ; buf[1 ] =0x1A ;
@@ -4073,9 +3910,8 @@ int mg_chg(struct scsi_cmnd *srb, struct rtsx_chip *chip)ms_cleanup_work (chip); retval =ms_switch_clock (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =mg_send_ex_cmd (chip,MG_GET_ID ,0 );if (retval !=STATUS_SUCCESS ) {
@@ -4148,9 +3984,8 @@ int mg_get_rsp_chg(struct scsi_cmnd *srb, struct rtsx_chip *chip)ms_cleanup_work (chip); retval =ms_switch_clock (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =mg_send_ex_cmd (chip,MG_MAKE_RMS ,0 );if (retval !=STATUS_SUCCESS ) {
@@ -4204,9 +4039,8 @@ int mg_rsp(struct scsi_cmnd *srb, struct rtsx_chip *chip)ms_cleanup_work (chip); retval =ms_switch_clock (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =mg_send_ex_cmd (chip,MG_MAKE_KSE ,0 );if (retval !=STATUS_SUCCESS ) {
@@ -4251,14 +4085,12 @@ int mg_get_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip)ms_cleanup_work (chip); retval =ms_switch_clock (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } buf =kmalloc (1028 ,GFP_KERNEL ); -if (!buf) { +if (!buf)return STATUS_ERROR ; - } buf[0 ] =0x04 ; buf[1 ] =0x02 ;
@@ -4307,14 +4139,12 @@ int mg_set_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip)ms_cleanup_work (chip); retval =ms_switch_clock (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } buf =kmalloc (1028 ,GFP_KERNEL ); -if (!buf) { +if (!buf)return STATUS_ERROR ; - } bufflen =min_t (int,1028 ,scsi_bufflen (srb));rtsx_stor_get_xfer_buf (buf, bufflen, srb);
@@ -4433,32 +4263,28 @@ int ms_power_off_card3v3(struct rtsx_chip *chip)int retval; retval =disable_card_clock (chip,MS_CARD ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }if (chip->asic_code) { retval =ms_pull_ctl_disable (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } }else { retval =rtsx_write_register (chip,FPGA_PULL_CTL ,FPGA_MS_PULL_CTL_BIT |0x20 ,FPGA_MS_PULL_CTL_BIT ); -if (retval) { +if (retval)return retval; - } } retval =rtsx_write_register (chip,CARD_OE ,MS_OUTPUT_EN ,0 ); -if (retval) { +if (retval)return retval; - } +if (!chip->ft2_fast_mode) { retval =card_power_off (chip,MS_CARD ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } }return STATUS_SUCCESS ;
@@ -4486,9 +4312,8 @@ int release_ms_card(struct rtsx_chip *chip)#endif retval =ms_power_off_card3v3 (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }return STATUS_SUCCESS ; }
drivers/staging/rts5208/rtsx_card.c +34 -58
234 lines not on this page · raw message
drivers/staging/rts5208/rtsx_card.h +1 -2
@@ -1062,9 +1062,8 @@ static inline int card_power_off_all(struct rtsx_chip *chip)int retval; retval =rtsx_write_register (chip,CARD_PWR_CTL ,0x0F ,0x0F ); -if (retval) { +if (retval)return retval; - }return STATUS_SUCCESS ; }
drivers/staging/rts5208/rtsx_chip.c +132 -264
1,067 lines not on this page · raw message
drivers/staging/rts5208/rtsx_scsi.c +36 -72
108 lines not on this page · raw message
drivers/staging/rts5208/sd.c +217 -432
649 lines not on this page · raw message
drivers/staging/rts5208/spi.c +47 -94
141 lines not on this page · raw message
drivers/staging/rts5208/xd.c +70 -140
210 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.17.1
Part of the diff is not shown here. View the raw message.