staging: rts5208: Cleanup
cover staging: rts5208: Cleanup
This patchset is just clean-up in xd.c and xd.h in the rts5208 driver. All checkpatch.pl issues have been resolved except for lines over 80 characters. Most of those should be refactored.
Wayne Porter (8):
staging: rts5208: Fix CamelCase found by checkpatch
staging: rts5208: xd.h: Alignment fix
staging: rts5208: Alignment fix
staging: rts5208: Logical continuation fixes
staging: rts5208: xd.c: Remove unnecessary parentheses
staging: rts5208: xd.c: Clean up comparison to NULL
staging: rts5208: xd.c: Fix CamelCase
staging: rts5208: xd.c: Remove multiple assignments
drivers/staging/rts5208/xd.c | 469 +++++++++++++++++++++++-------------------- drivers/staging/rts5208/xd.h | 10 +- 2 files changed, 253 insertions(+), 226 deletions(-)
Signature · 1 line
2.1.4
PATCH 1/8 staging: rts5208: Fix CamelCase found by checkpatch
Convert CamelCase to recommended style.
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/xd.c | 8 ++++---- drivers/staging/rts5208/xd.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/staging/rts5208/xd.c +4 -4
@@ -693,13 +693,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 ;
@@ -735,12 +735,12 @@ 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 ) {rtsx_trace (chip);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 ) {rtsx_trace (chip);
drivers/staging/rts5208/xd.h +4 -4
@@ -48,7 +48,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
@@ -84,8 +84,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
@@ -102,7 +102,7 @@#define NO_OFFSET 0x0#define WITH_OFFSET 0x1 -#define Sect_Per_Page 4 +#define SECT_PER_PAGE 4#define XD_ADDR_MODE_2C XD_ADDR_MODE_2A#define ZONE0_BAD_BLOCK 23
Signature · 1 line
2.1.4
Greg KH
maintainerRe: [PATCH 1/8] staging: rts5208: Fix CamelCase found by checkpatch
Quoted 13 lines · Wayne Porter
Convert CamelCase to recommended style.
Signed-off-by Wayne Porter <[email protected]>--- drivers/staging/rts5208/xd.c | 8 ++++---- drivers/staging/rts5208/xd.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)drivers/staging/rts5208/xd.c +0
-0
drivers/staging/rts5208/xd.c static int reset_xd(struct rtsx_chip *chip) · line 696
Quoted 4 lines
drivers/staging/rts5208/xd.c +0
-1@@ -693,13 +693,13 @@ static int reset_xd(struct rtsx_chip *chip) xd_card->zone_cnt =32 ; xd_card->capacity =1024000 ;break ; -case xD_1G_X8_512:
This is probably a spec-specific define, so I wouldn't worry about the checkpatch.pl warning for this, just leave it as-is please.
thanks,
greg k-h
PATCH 2/8 staging: rts5208: xd.h: Alignment fix
In reply to Wayne PorterChange alignment to match open parenthesis
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/xd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rts5208/xd.h +1 -1
@@ -179,7 +179,7 @@ int reset_xd_card(struct rtsx_chip *chip);int xd_delay_write (struct rtsx_chip *chip);#endif int xd_rw (struct scsi_cmnd *srb,struct rtsx_chip *chip, -u32 start_sector,u16 sector_cnt); +u32 start_sector,u16 sector_cnt);void xd_free_l2p_tbl (struct rtsx_chip *chip);void xd_cleanup_work (struct rtsx_chip *chip);int xd_power_off_card3v3 (struct rtsx_chip *chip);
Signature · 1 line
2.1.4
PATCH 3/8 staging: rts5208: Alignment fix
In reply to Wayne PorterCoding style checks found by checkpatch
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/xd.c | 332 +++++++++++++++++++++++-------------------- 1 file changed, 179 insertions(+), 153 deletions(-)
drivers/staging/rts5208/xd.c +179 -153
@@ -97,9 +97,9 @@ static int xd_read_id(struct rtsx_chip *chip, u8 id_cmd, u8 *id_buf, u8 buf_len)rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_DAT ,0xFF , id_cmd);rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_TRANSFER ,0xFF , -XD_TRANSFER_START |XD_READ_ID ); +XD_TRANSFER_START |XD_READ_ID );rtsx_add_cmd (chip,CHECK_REG_CMD ,XD_TRANSFER ,XD_TRANSFER_END , -XD_TRANSFER_END ); +XD_TRANSFER_END );for (i =0 ; i <4 ; i++)rtsx_add_cmd (chip,READ_REG_CMD , (u16)(XD_ADDRESS1 + i),0 ,0 );
@@ -129,21 +129,23 @@ static void xd_assign_phy_addr(struct rtsx_chip *chip, u32 addr, u8 mode)rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_ADDRESS0 ,0xFF ,0 );rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_ADDRESS1 ,0xFF , (u8 )addr);rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_ADDRESS2 , -0xFF , (u8)(addr >>8 )); +0xFF , (u8)(addr >>8 ));rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_ADDRESS3 , -0xFF , (u8)(addr >>16 )); +0xFF , (u8)(addr >>16 ));rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_CFG ,0xFF , - xd_card->addr_cycle |XD_CALC_ECC |XD_BA_NO_TRANSFORM ); + xd_card->addr_cycle | +XD_CALC_ECC | +XD_BA_NO_TRANSFORM );break ;case XD_ERASE_ADDR :rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_ADDRESS0 ,0xFF , (u8 )addr);rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_ADDRESS1 , -0xFF , (u8)(addr >>8 )); +0xFF , (u8)(addr >>8 ));rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_ADDRESS2 , -0xFF , (u8)(addr >>16 )); +0xFF , (u8)(addr >>16 ));rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_CFG ,0xFF , - (xd_card->addr_cycle -1 ) |XD_CALC_ECC | + (xd_card->addr_cycle -1 ) |XD_CALC_ECC |XD_BA_NO_TRANSFORM );break ;
@@ -153,7 +155,7 @@ static void xd_assign_phy_addr(struct rtsx_chip *chip, u32 addr, u8 mode) }static int xd_read_redundant (struct rtsx_chip *chip,u32 page_addr, -u8 *buf,int buf_len) +u8 *buf,int buf_len) {int retval, i;
@@ -162,16 +164,16 @@ static int xd_read_redundant(struct rtsx_chip *chip, u32 page_addr,xd_assign_phy_addr (chip, page_addr,XD_RW_ADDR );rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_TRANSFER , -0xFF ,XD_TRANSFER_START |XD_READ_REDUNDANT ); +0xFF ,XD_TRANSFER_START |XD_READ_REDUNDANT );rtsx_add_cmd (chip,CHECK_REG_CMD ,XD_TRANSFER , -XD_TRANSFER_END ,XD_TRANSFER_END ); +XD_TRANSFER_END ,XD_TRANSFER_END );for (i =0 ; i <6 ; i++)rtsx_add_cmd (chip,READ_REG_CMD , (u16)(XD_PAGE_STATUS + i), -0 ,0 ); +0 ,0 );for (i =0 ; i <4 ; i++)rtsx_add_cmd (chip,READ_REG_CMD , (u16)(XD_RESERVED0 + i), -0 ,0 ); +0 ,0 );rtsx_add_cmd (chip,READ_REG_CMD ,XD_PARITY ,0 ,0 ); retval =rtsx_send_cmd (chip,XD_CARD ,500 );
@@ -192,7 +194,7 @@ static int xd_read_redundant(struct rtsx_chip *chip, u32 page_addr, }static int xd_read_data_from_ppb (struct rtsx_chip *chip,int offset, -u8 *buf,int buf_len) +u8 *buf,int buf_len) {int retval, i;
@@ -205,7 +207,7 @@ static int xd_read_data_from_ppb(struct rtsx_chip *chip, int offset,for (i =0 ; i < buf_len; i++)rtsx_add_cmd (chip,READ_REG_CMD ,PPBUF_BASE2 + offset + i, -0 ,0 ); +0 ,0 ); retval =rtsx_send_cmd (chip,0 ,250 );if (retval <0 ) {
@@ -220,7 +222,7 @@ static int xd_read_data_from_ppb(struct rtsx_chip *chip, int offset, }static int xd_read_cis (struct rtsx_chip *chip,u32 page_addr,u8 *buf, -int buf_len) +int buf_len) {int retval;u8 reg;
@@ -235,15 +237,15 @@ static int xd_read_cis(struct rtsx_chip *chip, u32 page_addr, u8 *buf,xd_assign_phy_addr (chip, page_addr,XD_RW_ADDR );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_DATA_SOURCE , -0x01 ,PINGPONG_BUFFER ); +0x01 ,PINGPONG_BUFFER );rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_PAGE_CNT ,0xFF ,1 );rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_CHK_DATA_STATUS , -XD_AUTO_CHK_DATA_STATUS ,XD_AUTO_CHK_DATA_STATUS ); +XD_AUTO_CHK_DATA_STATUS ,XD_AUTO_CHK_DATA_STATUS );rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_TRANSFER ,0xFF , -XD_TRANSFER_START |XD_READ_PAGES ); +XD_TRANSFER_START |XD_READ_PAGES );rtsx_add_cmd (chip,CHECK_REG_CMD ,XD_TRANSFER ,XD_TRANSFER_END , -XD_TRANSFER_END ); +XD_TRANSFER_END ); retval =rtsx_send_cmd (chip,XD_CARD ,250 );if (retval == -ETIMEDOUT ) {
@@ -347,27 +349,27 @@ static void xd_fill_pull_ctl_disable(struct rtsx_chip *chip) {if (CHECK_PID (chip,0x5208 )) {rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_PULL_CTL1 ,0xFF , -XD_D3_PD |XD_D2_PD |XD_D1_PD |XD_D0_PD ); +XD_D3_PD |XD_D2_PD |XD_D1_PD |XD_D0_PD );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_PULL_CTL2 ,0xFF , -XD_D7_PD |XD_D6_PD |XD_D5_PD |XD_D4_PD ); +XD_D7_PD |XD_D6_PD |XD_D5_PD |XD_D4_PD );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_PULL_CTL3 ,0xFF , -XD_WP_PD |XD_CE_PD |XD_CLE_PD |XD_CD_PU ); +XD_WP_PD |XD_CE_PD |XD_CLE_PD |XD_CD_PU );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_PULL_CTL4 ,0xFF , -XD_RDY_PD |XD_WE_PD |XD_RE_PD |XD_ALE_PD ); +XD_RDY_PD |XD_WE_PD |XD_RE_PD |XD_ALE_PD );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_PULL_CTL5 ,0xFF , -MS_INS_PU |SD_WP_PD |SD_CD_PU |SD_CMD_PD ); +MS_INS_PU |SD_WP_PD |SD_CD_PU |SD_CMD_PD );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_PULL_CTL6 ,0xFF , -MS_D5_PD |MS_D4_PD ); +MS_D5_PD |MS_D4_PD ); }else if (CHECK_PID (chip,0x5288 )) {if (CHECK_BARO_PKG (chip,QFN )) {rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_PULL_CTL1 , -0xFF ,0x55 ); +0xFF ,0x55 );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_PULL_CTL2 , -0xFF ,0x55 ); +0xFF ,0x55 );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_PULL_CTL3 , -0xFF ,0x4B ); +0xFF ,0x4B );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_PULL_CTL4 , -0xFF ,0x69 ); +0xFF ,0x69 ); } } }
@@ -386,27 +388,27 @@ static void xd_fill_pull_ctl_enable(struct rtsx_chip *chip) {if (CHECK_PID (chip,0x5208 )) {rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_PULL_CTL1 ,0xFF , -XD_D3_PD |XD_D2_PD |XD_D1_PD |XD_D0_PD ); +XD_D3_PD |XD_D2_PD |XD_D1_PD |XD_D0_PD );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_PULL_CTL2 ,0xFF , -XD_D7_PD |XD_D6_PD |XD_D5_PD |XD_D4_PD ); +XD_D7_PD |XD_D6_PD |XD_D5_PD |XD_D4_PD );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_PULL_CTL3 ,0xFF , -XD_WP_PD |XD_CE_PU |XD_CLE_PD |XD_CD_PU ); +XD_WP_PD |XD_CE_PU |XD_CLE_PD |XD_CD_PU );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_PULL_CTL4 ,0xFF , -XD_RDY_PU |XD_WE_PU |XD_RE_PU |XD_ALE_PD ); +XD_RDY_PU |XD_WE_PU |XD_RE_PU |XD_ALE_PD );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_PULL_CTL5 ,0xFF , -MS_INS_PU |SD_WP_PD |SD_CD_PU |SD_CMD_PD ); +MS_INS_PU |SD_WP_PD |SD_CD_PU |SD_CMD_PD );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_PULL_CTL6 ,0xFF , -MS_D5_PD |MS_D4_PD ); +MS_D5_PD |MS_D4_PD ); }else if (CHECK_PID (chip,0x5288 )) {if (CHECK_BARO_PKG (chip,QFN )) {rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_PULL_CTL1 , -0xFF ,0x55 ); +0xFF ,0x55 );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_PULL_CTL2 , -0xFF ,0x55 ); +0xFF ,0x55 );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_PULL_CTL3 , -0xFF ,0x53 ); +0xFF ,0x53 );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_PULL_CTL4 , -0xFF ,0xA9 ); +0xFF ,0xA9 ); } } }
@@ -417,31 +419,46 @@ static int xd_pull_ctl_disable(struct rtsx_chip *chip)if (CHECK_PID (chip,0x5208 )) { retval =rtsx_write_register (chip,CARD_PULL_CTL1 ,0xFF , -XD_D3_PD |XD_D2_PD |XD_D1_PD |XD_D0_PD ); +XD_D3_PD | +XD_D2_PD | +XD_D1_PD | +XD_D0_PD );if (retval) {rtsx_trace (chip);return retval; } retval =rtsx_write_register (chip,CARD_PULL_CTL2 ,0xFF , -XD_D7_PD |XD_D6_PD |XD_D5_PD |XD_D4_PD ); +XD_D7_PD | +XD_D6_PD | +XD_D5_PD | +XD_D4_PD );if (retval) {rtsx_trace (chip);return retval; } retval =rtsx_write_register (chip,CARD_PULL_CTL3 ,0xFF , -XD_WP_PD |XD_CE_PD |XD_CLE_PD |XD_CD_PU ); +XD_WP_PD | +XD_CE_PD | +XD_CLE_PD | +XD_CD_PU );if (retval) {rtsx_trace (chip);return retval; } retval =rtsx_write_register (chip,CARD_PULL_CTL4 ,0xFF , -XD_RDY_PD |XD_WE_PD |XD_RE_PD |XD_ALE_PD ); +XD_RDY_PD | +XD_WE_PD | +XD_RE_PD | +XD_ALE_PD );if (retval) {rtsx_trace (chip);return retval; } retval =rtsx_write_register (chip,CARD_PULL_CTL5 ,0xFF , -MS_INS_PU |SD_WP_PD |SD_CD_PU |SD_CMD_PD ); +MS_INS_PU | +SD_WP_PD | +SD_CD_PU | +SD_CMD_PD );if (retval) {rtsx_trace (chip);return retval;
@@ -499,7 +516,7 @@ static int reset_xd(struct rtsx_chip *chip)rtsx_init_cmd (chip);rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_CHK_DATA_STATUS ,0xFF , -XD_PGSTS_NOT_FF ); +XD_PGSTS_NOT_FF );if (chip->asic_code) {if (!CHECK_PID (chip,0x5288 ))xd_fill_pull_ctl_disable (chip);
@@ -507,12 +524,13 @@ static int reset_xd(struct rtsx_chip *chip)xd_fill_pull_ctl_stage1_barossa (chip); }else {rtsx_add_cmd (chip,WRITE_REG_CMD ,FPGA_PULL_CTL ,0xFF , - (FPGA_XD_PULL_CTL_EN1 &FPGA_XD_PULL_CTL_EN3 ) |0x20 ); + (FPGA_XD_PULL_CTL_EN1 &FPGA_XD_PULL_CTL_EN3 ) | +0x20 ); }if (!chip->ft2_fast_mode)rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_INIT , -XD_NO_AUTO_PWR_OFF ,0 ); +XD_NO_AUTO_PWR_OFF ,0 );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_OE ,XD_OUTPUT_EN ,0 );
@@ -537,8 +555,9 @@ static int reset_xd(struct rtsx_chip *chip)xd_fill_pull_ctl_enable (chip); }else {rtsx_add_cmd (chip,WRITE_REG_CMD ,FPGA_PULL_CTL ,0xFF , - (FPGA_XD_PULL_CTL_EN1 &FPGA_XD_PULL_CTL_EN2 ) | -0x20 ); + (FPGA_XD_PULL_CTL_EN1 & +FPGA_XD_PULL_CTL_EN2 ) | +0x20 ); } retval =rtsx_send_cmd (chip,XD_CARD ,100 );
@@ -571,8 +590,9 @@ static int reset_xd(struct rtsx_chip *chip)xd_fill_pull_ctl_enable (chip); }else {rtsx_add_cmd (chip,WRITE_REG_CMD ,FPGA_PULL_CTL ,0xFF , - (FPGA_XD_PULL_CTL_EN1 &FPGA_XD_PULL_CTL_EN2 ) | -0x20 ); + (FPGA_XD_PULL_CTL_EN1 & +FPGA_XD_PULL_CTL_EN2 ) | +0x20 ); } }
@@ -599,16 +619,17 @@ static int reset_xd(struct rtsx_chip *chip)rtsx_init_cmd (chip);rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_DTCTL ,0xFF , -XD_TIME_SETUP_STEP *3 + -XD_TIME_RW_STEP * (2 + i) +XD_TIME_RWN_STEP * i); +XD_TIME_SETUP_STEP *3 + +XD_TIME_RW_STEP * (2 + i) +XD_TIME_RWN_STEP * i);rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_CATCTL ,0xFF , -XD_TIME_SETUP_STEP *3 +XD_TIME_RW_STEP * (4 + i) + -XD_TIME_RWN_STEP * (3 + i)); +XD_TIME_SETUP_STEP *3 + +XD_TIME_RW_STEP * (4 + i) + +XD_TIME_RWN_STEP * (3 + i));rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_TRANSFER ,0xFF , -XD_TRANSFER_START |XD_RESET ); +XD_TRANSFER_START |XD_RESET );rtsx_add_cmd (chip,CHECK_REG_CMD ,XD_TRANSFER , -XD_TRANSFER_END ,XD_TRANSFER_END ); +XD_TRANSFER_END ,XD_TRANSFER_END );rtsx_add_cmd (chip,READ_REG_CMD ,XD_DAT ,0 ,0 );rtsx_add_cmd (chip,READ_REG_CMD ,XD_CTL ,0 ,0 );
@@ -625,7 +646,7 @@ static int reset_xd(struct rtsx_chip *chip) ptr[0], ptr[1]);if (((ptr[0 ] &READY_FLAG ) !=READY_STATE ) || - !(ptr[1 ] &XD_RDY )) + !(ptr[1 ] &XD_RDY ))continue ; retval =xd_read_id (chip,READ_ID , id_buf,4 );
@@ -773,7 +794,7 @@ static int reset_xd(struct rtsx_chip *chip)if (redunt[PAGE_STATUS ] !=XD_GPG ) {for (j =1 ; j <=8 ; j++) { retval =xd_read_redundant (chip, page_addr + j, - redunt,11 ); + redunt,11 );if (retval ==STATUS_SUCCESS ) {if (redunt[PAGE_STATUS ] ==XD_GPG )break ;
@@ -786,7 +807,7 @@ static int reset_xd(struct rtsx_chip *chip)/* Check CIS data */ if ((redunt[BLOCK_STATUS ] ==XD_GBLK ) && - (redunt[PARITY ] &XD_BA1_ALL0 )) { + (redunt[PARITY ] &XD_BA1_ALL0 )) {u8 buf[10 ]; page_addr += j;
@@ -798,11 +819,11 @@ static int reset_xd(struct rtsx_chip *chip) }if ((buf[0 ] ==0x01 ) && (buf[1 ] ==0x03 ) && - (buf[2 ] ==0xD9 ) - && (buf[3 ] ==0x01 ) && (buf[4 ] ==0xFF ) - && (buf[5 ] ==0x18 ) && (buf[6 ] ==0x02 ) - && (buf[7 ] ==0xDF ) && (buf[8 ] ==0x01 ) - && (buf[9 ] ==0x20 )) { + (buf[2 ] ==0xD9 ) + && (buf[3 ] ==0x01 ) && (buf[4 ] ==0xFF ) + && (buf[5 ] ==0x18 ) && (buf[6 ] ==0x02 ) + && (buf[7 ] ==0xDF ) && (buf[8 ] ==0x01 ) + && (buf[9 ] ==0x20 )) { xd_card->cis_block = (u16 )i; } }
@@ -957,7 +978,7 @@ static u32 xd_get_unused_block(struct rtsx_chip *chip, int zone_no) zone = &(xd_card->zone[zone_no]);if ((zone->unused_blk_cnt ==0 ) || - (zone->set_index == zone->get_index)) { + (zone->set_index == zone->get_index)) {free_zone (zone);dev_dbg (rtsx_dev (chip),"Get unused block fail, no unused block available\n" );return BLK_NOT_FOUND ;
@@ -982,7 +1003,7 @@ static u32 xd_get_unused_block(struct rtsx_chip *chip, int zone_no) }static void xd_set_l2p_tbl (struct rtsx_chip *chip, -int zone_no,u16 log_off,u16 phy_off) +int zone_no,u16 log_off,u16 phy_off) {struct xd_info *xd_card = &(chip->xd_card);struct zone_entry *zone;
@@ -1023,7 +1044,7 @@ static u32 xd_get_l2p_tbl(struct rtsx_chip *chip, int zone_no, u16 log_off) } retval =xd_init_page (chip, phy_blk, log_off, -0 , xd_card->page_off +1 ); +0 , xd_card->page_off +1 );if (retval ==STATUS_SUCCESS )break ; }
@@ -1107,12 +1128,12 @@ static int xd_mark_bad_block(struct rtsx_chip *chip, u32 phy_blk)xd_assign_phy_addr (chip, page_addr,XD_RW_ADDR );rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_PAGE_CNT ,0xFF , - xd_card->page_off +1 ); + xd_card->page_off +1 );rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_TRANSFER ,0xFF , -XD_TRANSFER_START |XD_WRITE_REDUNDANT ); +XD_TRANSFER_START |XD_WRITE_REDUNDANT );rtsx_add_cmd (chip,CHECK_REG_CMD ,XD_TRANSFER , -XD_TRANSFER_END ,XD_TRANSFER_END ); +XD_TRANSFER_END ,XD_TRANSFER_END ); retval =rtsx_send_cmd (chip,XD_CARD ,500 );if (retval <0 ) {
@@ -1153,7 +1174,7 @@ static int xd_init_page(struct rtsx_chip *chip, u32 phy_blk,rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_PAGE_STATUS ,0xFF ,0xFF );rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_BLOCK_STATUS ,0xFF ,0xFF );rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_BLOCK_ADDR1_H , -0xFF , (u8)(logoff >>8 )); +0xFF , (u8)(logoff >>8 ));rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_BLOCK_ADDR1_L ,0xFF , (u8 )logoff); page_addr = (phy_blk << xd_card->block_shift) + start_page;
@@ -1161,15 +1182,15 @@ static int xd_init_page(struct rtsx_chip *chip, u32 phy_blk,xd_assign_phy_addr (chip, page_addr,XD_RW_ADDR );rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_CFG , -XD_BA_TRANSFORM ,XD_BA_TRANSFORM ); +XD_BA_TRANSFORM ,XD_BA_TRANSFORM );rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_PAGE_CNT , -0xFF , (end_page - start_page)); +0xFF , (end_page - start_page));rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_TRANSFER , -0xFF ,XD_TRANSFER_START |XD_WRITE_REDUNDANT ); +0xFF ,XD_TRANSFER_START |XD_WRITE_REDUNDANT );rtsx_add_cmd (chip,CHECK_REG_CMD ,XD_TRANSFER , -XD_TRANSFER_END ,XD_TRANSFER_END ); +XD_TRANSFER_END ,XD_TRANSFER_END ); retval =rtsx_send_cmd (chip,XD_CARD ,500 );if (retval <0 ) {
@@ -1235,11 +1256,11 @@ static int xd_copy_page(struct rtsx_chip *chip, u32 old_blk, u32 new_blk,rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_PAGE_CNT ,0xFF ,1 );rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_CHK_DATA_STATUS , -XD_AUTO_CHK_DATA_STATUS ,0 ); +XD_AUTO_CHK_DATA_STATUS ,0 );rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_TRANSFER ,0xFF , -XD_TRANSFER_START |XD_READ_PAGES ); +XD_TRANSFER_START |XD_READ_PAGES );rtsx_add_cmd (chip,CHECK_REG_CMD ,XD_TRANSFER , -XD_TRANSFER_END ,XD_TRANSFER_END ); +XD_TRANSFER_END ,XD_TRANSFER_END ); retval =rtsx_send_cmd (chip,XD_CARD ,500 );if (retval <0 ) {
@@ -1250,7 +1271,7 @@ static int xd_copy_page(struct rtsx_chip *chip, u32 old_blk, u32 new_blk,wait_timeout (100 );if (detect_card_cd (chip, -XD_CARD ) !=STATUS_SUCCESS ) { +XD_CARD ) !=STATUS_SUCCESS ) {xd_set_err_code (chip,XD_NO_CARD );rtsx_trace (chip);return STATUS_FAIL ;
@@ -1261,11 +1282,13 @@ static int xd_copy_page(struct rtsx_chip *chip, u32 old_blk, u32 new_blk, || ((reg & (XD_ECC2_ERROR | XD_ECC2_UNCORRECTABLE)) == (XD_ECC2_ERROR | XD_ECC2_UNCORRECTABLE))) {rtsx_write_register (chip, -XD_PAGE_STATUS ,0xFF , -XD_BPG ); +XD_PAGE_STATUS , +0xFF , +XD_BPG );rtsx_write_register (chip, -XD_BLOCK_STATUS ,0xFF , -XD_GBLK ); +XD_BLOCK_STATUS , +0xFF , +XD_GBLK );XD_SET_BAD_OLDBLK (xd_card);dev_dbg (rtsx_dev (chip),"old block 0x%x ecc error\n" , old_blk);
@@ -1287,7 +1310,7 @@ static int xd_copy_page(struct rtsx_chip *chip, u32 old_blk, u32 new_blk,rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_TRANSFER ,0xFF ,XD_TRANSFER_START |XD_WRITE_PAGES );rtsx_add_cmd (chip,CHECK_REG_CMD ,XD_TRANSFER , -XD_TRANSFER_END ,XD_TRANSFER_END ); +XD_TRANSFER_END ,XD_TRANSFER_END ); retval =rtsx_send_cmd (chip,XD_CARD ,300 );if (retval <0 ) {
@@ -1320,9 +1343,9 @@ static int xd_reset_cmd(struct rtsx_chip *chip)rtsx_init_cmd (chip);rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_TRANSFER , -0xFF ,XD_TRANSFER_START |XD_RESET ); +0xFF ,XD_TRANSFER_START |XD_RESET );rtsx_add_cmd (chip,CHECK_REG_CMD ,XD_TRANSFER , -XD_TRANSFER_END ,XD_TRANSFER_END ); +XD_TRANSFER_END ,XD_TRANSFER_END );rtsx_add_cmd (chip,READ_REG_CMD ,XD_DAT ,0 ,0 );rtsx_add_cmd (chip,READ_REG_CMD ,XD_CTL ,0 ,0 );
@@ -1360,9 +1383,9 @@ static int xd_erase_block(struct rtsx_chip *chip, u32 phy_blk)xd_assign_phy_addr (chip, page_addr,XD_ERASE_ADDR );rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_TRANSFER ,0xFF , -XD_TRANSFER_START |XD_ERASE ); +XD_TRANSFER_START |XD_ERASE );rtsx_add_cmd (chip,CHECK_REG_CMD ,XD_TRANSFER , -XD_TRANSFER_END ,XD_TRANSFER_END ); +XD_TRANSFER_END ,XD_TRANSFER_END );rtsx_add_cmd (chip,READ_REG_CMD ,XD_DAT ,0 ,0 ); retval =rtsx_send_cmd (chip,XD_CARD ,250 );
@@ -1490,7 +1513,7 @@ static int xd_build_l2p_tbl(struct rtsx_chip *chip, int zone_no) cur_fst_page_logoff =xd_load_log_block_addr (redunt);if ((cur_fst_page_logoff ==0xFFFF ) || - (cur_fst_page_logoff > max_logoff)) { + (cur_fst_page_logoff > max_logoff)) { retval =xd_erase_block (chip, i);if (retval ==STATUS_SUCCESS )xd_set_unused_block (chip, i);
@@ -1498,7 +1521,7 @@ static int xd_build_l2p_tbl(struct rtsx_chip *chip, int zone_no) }if ((zone_no ==0 ) && (cur_fst_page_logoff ==0 ) && - (redunt[PAGE_STATUS ] !=XD_GPG )) + (redunt[PAGE_STATUS ] !=XD_GPG ))XD_SET_MBR_FAIL (xd_card);if (zone->l2p_table[cur_fst_page_logoff] ==0xFFFF ) {
@@ -1524,7 +1547,7 @@ static int xd_build_l2p_tbl(struct rtsx_chip *chip, int zone_no)for (m =0 ; m <3 ; m++) { retval =xd_read_redundant (chip, page_addr, - redunt,11 ); + redunt,11 );if (retval ==STATUS_SUCCESS )break ; }
@@ -1598,9 +1621,9 @@ static int xd_send_cmd(struct rtsx_chip *chip, u8 cmd)rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_DAT ,0xFF , cmd);rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_TRANSFER ,0xFF , -XD_TRANSFER_START |XD_SET_CMD ); +XD_TRANSFER_START |XD_SET_CMD );rtsx_add_cmd (chip,CHECK_REG_CMD ,XD_TRANSFER , -XD_TRANSFER_END ,XD_TRANSFER_END ); +XD_TRANSFER_END ,XD_TRANSFER_END ); retval =rtsx_send_cmd (chip,XD_CARD ,200 );if (retval <0 ) {
@@ -1612,9 +1635,9 @@ static int xd_send_cmd(struct rtsx_chip *chip, u8 cmd) }static int xd_read_multiple_pages (struct rtsx_chip *chip,u32 phy_blk, -u32 log_blk,u8 start_page,u8 end_page, -u8 *buf,unsigned int *index, -unsigned int *offset) +u32 log_blk,u8 start_page,u8 end_page, +u8 *buf,unsigned int *index, +unsigned int *offset) {struct xd_info *xd_card = &(chip->xd_card);u32 page_addr, new_blk;
@@ -1653,22 +1676,23 @@ static int xd_read_multiple_pages(struct rtsx_chip *chip, u32 phy_blk,rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_DATA_SOURCE ,0x01 ,RING_BUFFER );rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_PAGE_CNT ,0xFF , page_cnt);rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_CHK_DATA_STATUS , -XD_AUTO_CHK_DATA_STATUS ,XD_AUTO_CHK_DATA_STATUS ); +XD_AUTO_CHK_DATA_STATUS ,XD_AUTO_CHK_DATA_STATUS );trans_dma_enable (chip->srb->sc_data_direction, chip, - page_cnt *512 ,DMA_512 ); + page_cnt *512 ,DMA_512 );rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_TRANSFER ,0xFF , -XD_TRANSFER_START |XD_READ_PAGES ); +XD_TRANSFER_START |XD_READ_PAGES );rtsx_add_cmd (chip,CHECK_REG_CMD ,XD_TRANSFER , -XD_TRANSFER_END |XD_PPB_EMPTY ,XD_TRANSFER_END |XD_PPB_EMPTY ); +XD_TRANSFER_END |XD_PPB_EMPTY , +XD_TRANSFER_END |XD_PPB_EMPTY );rtsx_send_cmd_no_wait (chip); retval =rtsx_transfer_data_partial (chip,XD_CARD , buf, page_cnt *512 , -scsi_sg_count (chip->srb), - index, offset,DMA_FROM_DEVICE , - chip->xd_timeout); +scsi_sg_count (chip->srb), + index, offset,DMA_FROM_DEVICE , + chip->xd_timeout);if (retval <0 ) {rtsx_clear_xd_error (chip);
@@ -1719,7 +1743,7 @@ Fail: } retval =xd_copy_page (chip, phy_blk, new_blk,0 , - xd_card->page_off +1 ); + xd_card->page_off +1 );if (retval !=STATUS_SUCCESS ) {if (!XD_CHK_BAD_NEWBLK (xd_card)) { retval =xd_erase_block (chip, new_blk);
@@ -1743,7 +1767,7 @@ Status_Fail: }static int xd_finish_write (struct rtsx_chip *chip, -u32 old_blk,u32 new_blk,u32 log_blk,u8 page_off) +u32 old_blk,u32 new_blk,u32 log_blk,u8 page_off) {struct xd_info *xd_card = &(chip->xd_card);int retval, zone_no;
@@ -1762,7 +1786,7 @@ static int xd_finish_write(struct rtsx_chip *chip,if (old_blk ==BLK_NOT_FOUND ) { retval =xd_init_page (chip, new_blk, log_off, - page_off, xd_card->page_off +1 ); + page_off, xd_card->page_off +1 );if (retval !=STATUS_SUCCESS ) { retval =xd_erase_block (chip, new_blk);if (retval ==STATUS_SUCCESS )
@@ -1772,7 +1796,7 @@ static int xd_finish_write(struct rtsx_chip *chip, } }else { retval =xd_copy_page (chip, old_blk, new_blk, - page_off, xd_card->page_off +1 ); + page_off, xd_card->page_off +1 );if (retval !=STATUS_SUCCESS ) {if (!XD_CHK_BAD_NEWBLK (xd_card)) { retval =xd_erase_block (chip, new_blk);
@@ -1804,7 +1828,7 @@ static int xd_finish_write(struct rtsx_chip *chip, }static int xd_prepare_write (struct rtsx_chip *chip, -u32 old_blk,u32 new_blk,u32 log_blk,u8 page_off) +u32 old_blk,u32 new_blk,u32 log_blk,u8 page_off) {int retval;
@@ -1823,9 +1847,9 @@ static int xd_prepare_write(struct rtsx_chip *chip, }static int xd_write_multiple_pages (struct rtsx_chip *chip,u32 old_blk, -u32 new_blk,u32 log_blk,u8 start_page, -u8 end_page,u8 *buf,unsigned int *index, -unsigned int *offset) +u32 new_blk,u32 log_blk,u8 start_page, +u8 end_page,u8 *buf,unsigned int *index, +unsigned int *offset) {struct xd_info *xd_card = &(chip->xd_card);u32 page_addr;
@@ -1852,7 +1876,7 @@ static int xd_write_multiple_pages(struct rtsx_chip *chip, u32 old_blk,rtsx_init_cmd (chip);rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_BLOCK_ADDR1_H , -0xFF , (u8)(log_off >>8 )); +0xFF , (u8)(log_off >>8 ));rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_BLOCK_ADDR1_L ,0xFF , (u8 )log_off);rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_BLOCK_STATUS ,0xFF ,XD_GBLK );rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_PAGE_STATUS ,0xFF ,XD_GPG );
@@ -1860,23 +1884,23 @@ static int xd_write_multiple_pages(struct rtsx_chip *chip, u32 old_blk,xd_assign_phy_addr (chip, page_addr,XD_RW_ADDR );rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_CFG ,XD_BA_TRANSFORM , -XD_BA_TRANSFORM ); +XD_BA_TRANSFORM );rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_PAGE_CNT ,0xFF , page_cnt);rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_DATA_SOURCE ,0x01 ,RING_BUFFER );trans_dma_enable (chip->srb->sc_data_direction, chip, - page_cnt *512 ,DMA_512 ); + page_cnt *512 ,DMA_512 );rtsx_add_cmd (chip,WRITE_REG_CMD ,XD_TRANSFER , -0xFF ,XD_TRANSFER_START |XD_WRITE_PAGES ); +0xFF ,XD_TRANSFER_START |XD_WRITE_PAGES );rtsx_add_cmd (chip,CHECK_REG_CMD ,XD_TRANSFER , -XD_TRANSFER_END ,XD_TRANSFER_END ); +XD_TRANSFER_END ,XD_TRANSFER_END );rtsx_send_cmd_no_wait (chip); retval =rtsx_transfer_data_partial (chip,XD_CARD , buf, page_cnt *512 , -scsi_sg_count (chip->srb), - index, offset,DMA_TO_DEVICE , chip->xd_timeout); +scsi_sg_count (chip->srb), + index, offset,DMA_TO_DEVICE , chip->xd_timeout);if (retval <0 ) {rtsx_clear_xd_error (chip);
@@ -1944,9 +1968,10 @@ int xd_delay_write(struct rtsx_chip *chip) delay_write->delay_write_flag =0 ; retval =xd_finish_write (chip, - delay_write->old_phyblock, - delay_write->new_phyblock, - delay_write->logblock, delay_write->pageoff); + delay_write->old_phyblock, + delay_write->new_phyblock, + delay_write->logblock, + delay_write->pageoff);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -1958,7 +1983,7 @@ int xd_delay_write(struct rtsx_chip *chip)#endif int xd_rw (struct scsi_cmnd *srb,struct rtsx_chip *chip, -u32 start_sector,u16 sector_cnt) +u32 start_sector,u16 sector_cnt) {struct xd_info *xd_card = &(chip->xd_card);unsigned int lun =SCSI_LUN (srb);
@@ -2012,17 +2037,18 @@ int xd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip,if (srb->sc_data_direction ==DMA_TO_DEVICE ) {#ifdef XD_DELAY_WRITE if (delay_write->delay_write_flag && - (delay_write->logblock == log_blk) && - (start_page > delay_write->pageoff)) { + (delay_write->logblock == log_blk) && + (start_page > delay_write->pageoff)) { delay_write->delay_write_flag =0 ;if (delay_write->old_phyblock !=BLK_NOT_FOUND ) { retval =xd_copy_page (chip, - delay_write->old_phyblock, - delay_write->new_phyblock, - delay_write->pageoff, start_page); + delay_write->old_phyblock, + delay_write->new_phyblock, + delay_write->pageoff, + start_page);if (retval !=STATUS_SUCCESS ) {set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_WRITE_ERR ); +SENSE_TYPE_MEDIA_WRITE_ERR );rtsx_trace (chip);return STATUS_FAIL ; }
@@ -2039,7 +2065,7 @@ int xd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, retval =xd_delay_write (chip);if (retval !=STATUS_SUCCESS ) {set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_WRITE_ERR ); +SENSE_TYPE_MEDIA_WRITE_ERR );rtsx_trace (chip);return STATUS_FAIL ; }
@@ -2047,25 +2073,25 @@ int xd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, old_blk =xd_get_l2p_tbl (chip, zone_no, log_off); new_blk =xd_get_unused_block (chip, zone_no);if ((old_blk ==BLK_NOT_FOUND ) || - (new_blk ==BLK_NOT_FOUND )) { + (new_blk ==BLK_NOT_FOUND )) {set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_WRITE_ERR ); +SENSE_TYPE_MEDIA_WRITE_ERR );rtsx_trace (chip);return STATUS_FAIL ; } retval =xd_prepare_write (chip, old_blk, new_blk, - log_blk, start_page); + log_blk, start_page);if (retval !=STATUS_SUCCESS ) {if (detect_card_cd (chip,XD_CARD ) !=STATUS_SUCCESS ) {set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_NOT_PRESENT ); +SENSE_TYPE_MEDIA_NOT_PRESENT );rtsx_trace (chip);return STATUS_FAIL ; }set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_WRITE_ERR ); +SENSE_TYPE_MEDIA_WRITE_ERR );rtsx_trace (chip);return STATUS_FAIL ; }
@@ -2078,12 +2104,12 @@ int xd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip,if (retval !=STATUS_SUCCESS ) {if (detect_card_cd (chip,XD_CARD ) !=STATUS_SUCCESS ) {set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_NOT_PRESENT ); +SENSE_TYPE_MEDIA_NOT_PRESENT );rtsx_trace (chip);return STATUS_FAIL ; }set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR ); +SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR );rtsx_trace (chip);return STATUS_FAIL ; }
@@ -2092,7 +2118,7 @@ int xd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, old_blk =xd_get_l2p_tbl (chip, zone_no, log_off);if (old_blk ==BLK_NOT_FOUND ) {set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR ); +SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR );rtsx_trace (chip);return STATUS_FAIL ; }
@@ -2116,22 +2142,22 @@ int xd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, page_cnt = end_page - start_page;if (srb->sc_data_direction ==DMA_FROM_DEVICE ) { retval =xd_read_multiple_pages (chip, old_blk, log_blk, - start_page, end_page, ptr, - &index, &offset); + start_page, end_page, + ptr, &index, &offset);if (retval !=STATUS_SUCCESS ) {set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR ); +SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR );rtsx_trace (chip);return STATUS_FAIL ; } }else { retval =xd_write_multiple_pages (chip, old_blk, - new_blk, log_blk, - start_page, end_page, ptr, - &index, &offset); + new_blk, log_blk, + start_page, end_page, + ptr, &index, &offset);if (retval !=STATUS_SUCCESS ) {set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_WRITE_ERR ); +SENSE_TYPE_MEDIA_WRITE_ERR );rtsx_trace (chip);return STATUS_FAIL ; }
@@ -2153,7 +2179,7 @@ int xd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip,if (retval !=STATUS_SUCCESS ) { chip->card_fail |=XD_CARD ;set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_NOT_PRESENT ); +SENSE_TYPE_MEDIA_NOT_PRESENT );rtsx_trace (chip);return STATUS_FAIL ; }
@@ -2163,10 +2189,10 @@ int xd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip,if (old_blk ==BLK_NOT_FOUND ) {if (srb->sc_data_direction ==DMA_FROM_DEVICE )set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR ); +SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR );else set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_WRITE_ERR ); +SENSE_TYPE_MEDIA_WRITE_ERR );rtsx_trace (chip);return STATUS_FAIL ;
@@ -2176,7 +2202,7 @@ int xd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, new_blk =xd_get_unused_block (chip, zone_no);if (new_blk ==BLK_NOT_FOUND ) {set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_WRITE_ERR ); +SENSE_TYPE_MEDIA_WRITE_ERR );rtsx_trace (chip);return STATUS_FAIL ; }
@@ -2186,7 +2212,7 @@ int xd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, }if ((srb->sc_data_direction ==DMA_TO_DEVICE ) && - (end_page != (xd_card->page_off +1 ))) { + (end_page != (xd_card->page_off +1 ))) {#ifdef XD_DELAY_WRITE delay_write->delay_write_flag =1 ; delay_write->old_phyblock = old_blk;
@@ -2202,11 +2228,11 @@ int xd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, } retval =xd_finish_write (chip, old_blk, new_blk, - log_blk, end_page); + log_blk, end_page);if (retval !=STATUS_SUCCESS ) {if (detect_card_cd (chip,XD_CARD ) !=STATUS_SUCCESS ) {set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_NOT_PRESENT ); +SENSE_TYPE_MEDIA_NOT_PRESENT );rtsx_trace (chip);return STATUS_FAIL ; }
Signature · 1 line
2.1.4
PATCH 4/8 staging: rts5208: Logical continuation fixes
In reply to Wayne PorterCheckpatch detected multiple instances of logical continuation warnings
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/xd.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/staging/rts5208/xd.c +13 -13
@@ -819,11 +819,11 @@ static int reset_xd(struct rtsx_chip *chip) }if ((buf[0 ] ==0x01 ) && (buf[1 ] ==0x03 ) && - (buf[2 ] ==0xD9 ) - && (buf[3 ] ==0x01 ) && (buf[4 ] ==0xFF ) - && (buf[5 ] ==0x18 ) && (buf[6 ] ==0x02 ) - && (buf[7 ] ==0xDF ) && (buf[8 ] ==0x01 ) - && (buf[9 ] ==0x20 )) { + (buf[2 ] ==0xD9 ) && + (buf[3 ] ==0x01 ) && (buf[4 ] ==0xFF ) && + (buf[5 ] ==0x18 ) && (buf[6 ] ==0x02 ) && + (buf[7 ] ==0xDF ) && (buf[8 ] ==0x01 ) && + (buf[9 ] ==0x20 )) { xd_card->cis_block = (u16 )i; } }
@@ -948,8 +948,8 @@ static void xd_set_unused_block(struct rtsx_chip *chip, u32 phy_blk)return ; } -if ((zone->set_index >=XD_FREE_TABLE_CNT ) - || (zone->set_index <0 )) { +if ((zone->set_index >=XD_FREE_TABLE_CNT ) || + (zone->set_index <0 )) {free_zone (zone);dev_dbg (rtsx_dev (chip),"Set unused block fail, invalid set_index\n" );return ;
@@ -1278,8 +1278,8 @@ static int xd_copy_page(struct rtsx_chip *chip, u32 old_blk, u32 new_blk, }if (((reg & (XD_ECC1_ERROR |XD_ECC1_UNCORRECTABLE )) == - (XD_ECC1_ERROR |XD_ECC1_UNCORRECTABLE )) - || ((reg & (XD_ECC2_ERROR |XD_ECC2_UNCORRECTABLE )) == + (XD_ECC1_ERROR |XD_ECC1_UNCORRECTABLE )) || + ((reg & (XD_ECC2_ERROR |XD_ECC2_UNCORRECTABLE )) == (XD_ECC2_ERROR |XD_ECC2_UNCORRECTABLE ))) { rtsx_write_register(chip, XD_PAGE_STATUS,
@@ -1723,10 +1723,10 @@ Fail:return retval; } -if (((reg_val & (XD_ECC1_ERROR |XD_ECC1_UNCORRECTABLE )) - == (XD_ECC1_ERROR |XD_ECC1_UNCORRECTABLE )) - || ((reg_val & (XD_ECC2_ERROR |XD_ECC2_UNCORRECTABLE )) - == (XD_ECC2_ERROR |XD_ECC2_UNCORRECTABLE ))) { +if (((reg_val & (XD_ECC1_ERROR |XD_ECC1_UNCORRECTABLE )) == + (XD_ECC1_ERROR |XD_ECC1_UNCORRECTABLE )) || + ((reg_val & (XD_ECC2_ERROR |XD_ECC2_UNCORRECTABLE )) == + (XD_ECC2_ERROR |XD_ECC2_UNCORRECTABLE ))) {wait_timeout (100 );if (detect_card_cd (chip,XD_CARD ) !=STATUS_SUCCESS ) {
Signature · 1 line
2.1.4
Re: [PATCH 4/8] staging: rts5208: Logical continuation fixes
Quoted 1 line · Wayne Porter
Checkpatch detected multiple instances of logical continuation warnings
[]
drivers/staging/rts5208/xd.c
Quoted 1 line
drivers/staging/rts5208/xd.c +0
-0
[]
Quoted 4 lines
drivers/staging/rts5208/xd.c +0
-0@@ -819,11 +819,11 @@ static int reset_xd(struct rtsx_chip *chip) } if ((buf[0] == 0x01) && (buf[1] == 0x03) &&
drivers/staging/rts5208/xd.c static int reset_xd(struct rtsx_chip *chip) · line 826
Quoted 10 lines
drivers/staging/rts5208/xd.c +5
-5- (buf[2 ] ==0xD9 ) - && (buf[3 ] ==0x01 ) && (buf[4 ] ==0xFF ) - && (buf[5 ] ==0x18 ) && (buf[6 ] ==0x02 ) - && (buf[7 ] ==0xDF ) && (buf[8 ] ==0x01 ) - && (buf[9] == 0x20)) { + (buf[2 ] ==0xD9 ) && + (buf[3 ] ==0x01 ) && (buf[4 ] ==0xFF ) && + (buf[5 ] ==0x18 ) && (buf[6 ] ==0x02 ) && + (buf[7 ] ==0xDF ) && (buf[8 ] ==0x01 ) && + (buf[9] == 0x20)) {
memcmp might be easier to read
if (!memcmp(buf, "\x01\x03\xd9\x01\xff\x18\x02\xdf\x01\x20", 10))
PATCH 5/8 staging: rts5208: xd.c: Remove unnecessary parentheses
In reply to Wayne PorterIssues found with checkpatch
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/xd.c | 64 ++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 32 deletions(-)
drivers/staging/rts5208/xd.c +32 -32
@@ -37,21 +37,21 @@ static int xd_init_page(struct rtsx_chip *chip, u32 phy_blk, u16 logoff,static inline void xd_set_err_code (struct rtsx_chip *chip,u8 err_code) { -struct xd_info *xd_card = &(chip->xd_card); +struct xd_info *xd_card = &chip->xd_card; xd_card->err_code = err_code; }static inline int xd_check_err_code (struct rtsx_chip *chip,u8 err_code) { -struct xd_info *xd_card = &(chip->xd_card); +struct xd_info *xd_card = &chip->xd_card;return (xd_card->err_code == err_code); }static int xd_set_init_para (struct rtsx_chip *chip) { -struct xd_info *xd_card = &(chip->xd_card); +struct xd_info *xd_card = &chip->xd_card;int retval;if (chip->asic_code)
@@ -70,7 +70,7 @@ static int xd_set_init_para(struct rtsx_chip *chip)static int xd_switch_clock (struct rtsx_chip *chip) { -struct xd_info *xd_card = &(chip->xd_card); +struct xd_info *xd_card = &chip->xd_card;int retval; retval =select_card (chip,XD_CARD );
@@ -122,7 +122,7 @@ static int xd_read_id(struct rtsx_chip *chip, u8 id_cmd, u8 *id_buf, u8 buf_len)static void xd_assign_phy_addr (struct rtsx_chip *chip,u32 addr,u8 mode) { -struct xd_info *xd_card = &(chip->xd_card); +struct xd_info *xd_card = &chip->xd_card;switch (mode) {case XD_RW_ADDR :
@@ -503,7 +503,7 @@ static int xd_pull_ctl_disable(struct rtsx_chip *chip)static int reset_xd (struct rtsx_chip *chip) { -struct xd_info *xd_card = &(chip->xd_card); +struct xd_info *xd_card = &chip->xd_card;int retval, i, j;u8 *ptr, id_buf[4 ], redunt[11 ];
@@ -882,7 +882,7 @@ static u16 xd_load_log_block_addr(u8 *redunt)static int xd_init_l2p_tbl (struct rtsx_chip *chip) { -struct xd_info *xd_card = &(chip->xd_card); +struct xd_info *xd_card = &chip->xd_card;int size, i; dev_dbg(rtsx_dev(chip), "xd_init_l2p_tbl: zone_cnt = %d\n",
@@ -931,7 +931,7 @@ static inline void free_zone(struct zone_entry *zone)static void xd_set_unused_block (struct rtsx_chip *chip,u32 phy_blk) { -struct xd_info *xd_card = &(chip->xd_card); +struct xd_info *xd_card = &chip->xd_card;struct zone_entry *zone;int zone_no;
@@ -941,7 +941,7 @@ static void xd_set_unused_block(struct rtsx_chip *chip, u32 phy_blk) zone_no, xd_card->zone_cnt);return ; } - zone = &(xd_card->zone[zone_no]); + zone = &xd_card->zone[zone_no];if (zone->free_table ==NULL ) {if (xd_build_l2p_tbl (chip, zone_no) !=STATUS_SUCCESS )
@@ -966,7 +966,7 @@ static void xd_set_unused_block(struct rtsx_chip *chip, u32 phy_blk)static u32 xd_get_unused_block (struct rtsx_chip *chip,int zone_no) { -struct xd_info *xd_card = &(chip->xd_card); +struct xd_info *xd_card = &chip->xd_card;struct zone_entry *zone;u32 phy_blk;
@@ -975,7 +975,7 @@ static u32 xd_get_unused_block(struct rtsx_chip *chip, int zone_no) zone_no, xd_card->zone_cnt);return BLK_NOT_FOUND ; } - zone = &(xd_card->zone[zone_no]); + zone = &xd_card->zone[zone_no];if ((zone->unused_blk_cnt ==0 ) || (zone->set_index == zone->get_index)) {
@@ -1005,20 +1005,20 @@ static u32 xd_get_unused_block(struct rtsx_chip *chip, int zone_no)static void xd_set_l2p_tbl (struct rtsx_chip *chip,int zone_no,u16 log_off,u16 phy_off) { -struct xd_info *xd_card = &(chip->xd_card); +struct xd_info *xd_card = &chip->xd_card;struct zone_entry *zone; - zone = &(xd_card->zone[zone_no]); + zone = &xd_card->zone[zone_no]; zone->l2p_table[log_off] = phy_off; }static u32 xd_get_l2p_tbl (struct rtsx_chip *chip,int zone_no,u16 log_off) { -struct xd_info *xd_card = &(chip->xd_card); +struct xd_info *xd_card = &chip->xd_card;struct zone_entry *zone;int retval; - zone = &(xd_card->zone[zone_no]); + zone = &xd_card->zone[zone_no];if (zone->l2p_table[log_off] ==0xFFFF ) {u32 phy_blk =0 ;int i;
@@ -1062,7 +1062,7 @@ static u32 xd_get_l2p_tbl(struct rtsx_chip *chip, int zone_no, u16 log_off)int reset_xd_card (struct rtsx_chip *chip) { -struct xd_info *xd_card = &(chip->xd_card); +struct xd_info *xd_card = &chip->xd_card;int retval;memset (xd_card,0 ,sizeof (struct xd_info ));
@@ -1098,7 +1098,7 @@ int reset_xd_card(struct rtsx_chip *chip)static int xd_mark_bad_block (struct rtsx_chip *chip,u32 phy_blk) { -struct xd_info *xd_card = &(chip->xd_card); +struct xd_info *xd_card = &chip->xd_card;int retval;u32 page_addr;u8 reg =0 ;
@@ -1153,7 +1153,7 @@ static int xd_mark_bad_block(struct rtsx_chip *chip, u32 phy_blk)static int xd_init_page (struct rtsx_chip *chip,u32 phy_blk,u16 logoff,u8 start_page,u8 end_page) { -struct xd_info *xd_card = &(chip->xd_card); +struct xd_info *xd_card = &chip->xd_card;int retval;u32 page_addr;u8 reg =0 ;
@@ -1212,7 +1212,7 @@ static int xd_init_page(struct rtsx_chip *chip, u32 phy_blk,static int xd_copy_page (struct rtsx_chip *chip,u32 old_blk,u32 new_blk,u8 start_page,u8 end_page) { -struct xd_info *xd_card = &(chip->xd_card); +struct xd_info *xd_card = &chip->xd_card;u32 old_page, new_page;u8 i, reg =0 ;int retval;
@@ -1365,7 +1365,7 @@ static int xd_reset_cmd(struct rtsx_chip *chip)static int xd_erase_block (struct rtsx_chip *chip,u32 phy_blk) { -struct xd_info *xd_card = &(chip->xd_card); +struct xd_info *xd_card = &chip->xd_card;u32 page_addr;u8 reg =0 , *ptr;int i, retval;
@@ -1426,7 +1426,7 @@ static int xd_erase_block(struct rtsx_chip *chip, u32 phy_blk)static int xd_build_l2p_tbl (struct rtsx_chip *chip,int zone_no) { -struct xd_info *xd_card = &(chip->xd_card); +struct xd_info *xd_card = &chip->xd_card;struct zone_entry *zone;int retval;u32 start, end, i;
@@ -1448,7 +1448,7 @@ static int xd_build_l2p_tbl(struct rtsx_chip *chip, int zone_no)return STATUS_SUCCESS ; } - zone = &(xd_card->zone[zone_no]); + zone = &xd_card->zone[zone_no];if (zone->l2p_table ==NULL ) { zone->l2p_table =vmalloc (2000 );
@@ -1639,7 +1639,7 @@ static int xd_read_multiple_pages(struct rtsx_chip *chip, u32 phy_blk, u8 *buf, unsigned int *index, unsigned int *offset) { - struct xd_info *xd_card = &(chip->xd_card); + struct xd_info *xd_card = &chip->xd_card;u32 page_addr, new_blk;u16 log_off;u8 reg_val, page_cnt;
@@ -1769,7 +1769,7 @@ Status_Fail:static int xd_finish_write (struct rtsx_chip *chip,u32 old_blk,u32 new_blk,u32 log_blk,u8 page_off) { -struct xd_info *xd_card = &(chip->xd_card); +struct xd_info *xd_card = &chip->xd_card;int retval, zone_no;u16 log_off;
@@ -1851,7 +1851,7 @@ static int xd_write_multiple_pages(struct rtsx_chip *chip, u32 old_blk, u8 end_page, u8 *buf, unsigned int *index, unsigned int *offset) { - struct xd_info *xd_card = &(chip->xd_card); + struct xd_info *xd_card = &chip->xd_card;u32 page_addr;int zone_no, retval;u16 log_off;
@@ -1954,8 +1954,8 @@ Status_Fail:#ifdef XD_DELAY_WRITE int xd_delay_write (struct rtsx_chip *chip) { -struct xd_info *xd_card = &(chip->xd_card); -struct xd_delay_write_tag *delay_write = &(xd_card->delay_write); +struct xd_info *xd_card = &chip->xd_card; +struct xd_delay_write_tag *delay_write = &xd_card->delay_write;int retval;if (delay_write->delay_write_flag) {
@@ -1985,10 +1985,10 @@ int xd_delay_write(struct rtsx_chip *chip)int xd_rw (struct scsi_cmnd *srb,struct rtsx_chip *chip,u32 start_sector,u16 sector_cnt) { -struct xd_info *xd_card = &(chip->xd_card); +struct xd_info *xd_card = &chip->xd_card;unsigned int lun =SCSI_LUN (srb);#ifdef XD_DELAY_WRITE -struct xd_delay_write_tag *delay_write = &(xd_card->delay_write); +struct xd_delay_write_tag *delay_write = &xd_card->delay_write;#endif int retval, zone_no;unsigned int index =0 , offset =0 ;
@@ -2250,7 +2250,7 @@ int xd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip,void xd_free_l2p_tbl (struct rtsx_chip *chip) { -struct xd_info *xd_card = &(chip->xd_card); +struct xd_info *xd_card = &chip->xd_card;int i =0 ;if (xd_card->zone !=NULL ) {
@@ -2268,7 +2268,7 @@ void xd_free_l2p_tbl(struct rtsx_chip *chip)void xd_cleanup_work (struct rtsx_chip *chip) {#ifdef XD_DELAY_WRITE -struct xd_info *xd_card = &(chip->xd_card); +struct xd_info *xd_card = &chip->xd_card;if (xd_card->delay_write.delay_write_flag) {dev_dbg (rtsx_dev (chip),"xD: delay write\n" );
@@ -2323,7 +2323,7 @@ int xd_power_off_card3v3(struct rtsx_chip *chip)int release_xd_card (struct rtsx_chip *chip) { -struct xd_info *xd_card = &(chip->xd_card); +struct xd_info *xd_card = &chip->xd_card;int retval; chip->card_ready &= ~XD_CARD ;
Signature · 1 line
2.1.4
PATCH 6/8 staging: rts5208: xd.c: Clean up comparison to NULL
In reply to Wayne PorterCheckpatch recommended changes
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/xd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/staging/rts5208/xd.c +5 -5
@@ -943,7 +943,7 @@ static void xd_set_unused_block(struct rtsx_chip *chip, u32 phy_blk) } zone = &xd_card->zone[zone_no]; -if (zone->free_table ==NULL ) { +if (!zone->free_table) {if (xd_build_l2p_tbl (chip, zone_no) !=STATUS_SUCCESS )return ; }
@@ -1436,7 +1436,7 @@ static int xd_build_l2p_tbl(struct rtsx_chip *chip, int zone_no)dev_dbg (rtsx_dev (chip),"xd_build_l2p_tbl: %d\n" , zone_no); -if (xd_card->zone ==NULL ) { +if (!xd_card->zone) { retval =xd_init_l2p_tbl (chip);if (retval !=STATUS_SUCCESS )return retval;
@@ -1450,7 +1450,7 @@ static int xd_build_l2p_tbl(struct rtsx_chip *chip, int zone_no) zone = &xd_card->zone[zone_no]; -if (zone->l2p_table ==NULL ) { +if (!zone->l2p_table) { zone->l2p_table =vmalloc (2000 );if (!zone->l2p_table) {rtsx_trace (chip);
@@ -1459,7 +1459,7 @@ static int xd_build_l2p_tbl(struct rtsx_chip *chip, int zone_no) }memset ((u8 *)(zone->l2p_table),0xff ,2000 ); -if (zone->free_table ==NULL ) { +if (!zone->free_table) { zone->free_table =vmalloc (XD_FREE_TABLE_CNT *2 );if (!zone->free_table) {rtsx_trace (chip);
@@ -2253,7 +2253,7 @@ void xd_free_l2p_tbl(struct rtsx_chip *chip)struct xd_info *xd_card = &chip->xd_card;int i =0 ; -if (xd_card->zone !=NULL ) { +if (xd_card->zone) {for (i =0 ; i < xd_card->zone_cnt; i++) {vfree (xd_card->zone[i].l2p_table); xd_card->zone[i].l2p_table =NULL ;
Signature · 1 line
2.1.4
PATCH 7/8 staging: rts5208: xd.c: Fix CamelCase
In reply to Wayne PorterCovert CamelCase as checkpatch suggests
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/xd.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-)
drivers/staging/rts5208/xd.c +18 -18
@@ -1454,7 +1454,7 @@ static int xd_build_l2p_tbl(struct rtsx_chip *chip, int zone_no) zone->l2p_table =vmalloc (2000 );if (!zone->l2p_table) {rtsx_trace (chip); - goto Build_Fail; + goto build_fail; } }memset ((u8 *)(zone->l2p_table),0xff ,2000 );
@@ -1463,7 +1463,7 @@ static int xd_build_l2p_tbl(struct rtsx_chip *chip, int zone_no) zone->free_table =vmalloc (XD_FREE_TABLE_CNT *2 );if (!zone->free_table) {rtsx_trace (chip); - goto Build_Fail; + goto build_fail; } }memset ((u8 *)(zone->free_table),0xff ,XD_FREE_TABLE_CNT *2 );
@@ -1604,7 +1604,7 @@ static int xd_build_l2p_tbl(struct rtsx_chip *chip, int zone_no)return STATUS_SUCCESS ; -Build_Fail: +build_fail:vfree (zone->l2p_table); zone->l2p_table =NULL ;vfree (zone->free_table);
@@ -1646,7 +1646,7 @@ static int xd_read_multiple_pages(struct rtsx_chip *chip, u32 phy_blk,int zone_no, retval, i;if (start_page > end_page) - goto Status_Fail; + goto status_fail; page_cnt = end_page - start_page; zone_no = (int )(log_blk /1000 );
@@ -1662,7 +1662,7 @@ static int xd_read_multiple_pages(struct rtsx_chip *chip, u32 phy_blk,if (detect_card_cd (chip,XD_CARD ) !=STATUS_SUCCESS ) {xd_set_err_code (chip,XD_NO_CARD ); - goto Status_Fail; + goto status_fail; } } }
@@ -1698,16 +1698,16 @@ static int xd_read_multiple_pages(struct rtsx_chip *chip, u32 phy_blk,if (retval == -ETIMEDOUT ) {xd_set_err_code (chip,XD_TO_ERROR ); - goto Status_Fail; + goto status_fail; }else {rtsx_trace (chip); - goto Fail; + goto fail; } }return STATUS_SUCCESS ; -Fail: +fail: retval =rtsx_read_register (chip,XD_PAGE_STATUS , ®_val);if (retval) {rtsx_trace (chip);
@@ -1731,7 +1731,7 @@ Fail:if (detect_card_cd (chip,XD_CARD ) !=STATUS_SUCCESS ) {xd_set_err_code (chip,XD_NO_CARD ); - goto Status_Fail; + goto status_fail; }xd_set_err_code (chip,XD_ECC_ERROR );
@@ -1739,7 +1739,7 @@ Fail: new_blk =xd_get_unused_block (chip, zone_no);if (new_blk ==NO_NEW_BLK ) {XD_CLR_BAD_OLDBLK (xd_card); - goto Status_Fail; + goto status_fail; } retval = xd_copy_page(chip, phy_blk, new_blk, 0,
@@ -1753,7 +1753,7 @@ Fail:XD_CLR_BAD_NEWBLK (xd_card); }XD_CLR_BAD_OLDBLK (xd_card); - goto Status_Fail; + goto status_fail; }xd_set_l2p_tbl (chip, zone_no, log_off, (u16)(new_blk &0x3FF ));xd_erase_block (chip, phy_blk);
@@ -1761,7 +1761,7 @@ Fail:XD_CLR_BAD_OLDBLK (xd_card); } -Status_Fail: +status_fail:rtsx_trace (chip);return STATUS_FAIL ; }
@@ -1861,7 +1861,7 @@ static int xd_write_multiple_pages(struct rtsx_chip *chip, u32 old_blk, __func__, old_blk, new_blk, log_blk);if (start_page > end_page) - goto Status_Fail; + goto status_fail; page_cnt = end_page - start_page; zone_no = (int )(log_blk /1000 );
@@ -1871,7 +1871,7 @@ static int xd_write_multiple_pages(struct rtsx_chip *chip, u32 old_blk, retval =xd_send_cmd (chip,READ1_1 );if (retval !=STATUS_SUCCESS ) - goto Status_Fail; + goto status_fail;rtsx_init_cmd (chip);
@@ -1906,10 +1906,10 @@ static int xd_write_multiple_pages(struct rtsx_chip *chip, u32 old_blk,if (retval == -ETIMEDOUT ) {xd_set_err_code (chip,XD_TO_ERROR ); - goto Status_Fail; + goto status_fail; }else {rtsx_trace (chip); - goto Fail; + goto fail; } }
@@ -1935,7 +1935,7 @@ static int xd_write_multiple_pages(struct rtsx_chip *chip, u32 old_blk,return STATUS_SUCCESS ; -Fail: +fail: retval =rtsx_read_register (chip,XD_DAT , ®_val);if (retval) {rtsx_trace (chip);
@@ -1946,7 +1946,7 @@ Fail:xd_mark_bad_block (chip, new_blk); } -Status_Fail: +status_fail:rtsx_trace (chip);return STATUS_FAIL ; }
Signature · 1 line
2.1.4
PATCH 8/8 staging: rts5208: xd.c: Remove multiple assignments
In reply to Wayne PorterCheckpatch found multiple assignments on one line so move them to their own lines.
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/xd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/rts5208/xd.c +2 -1
@@ -1489,7 +1489,8 @@ static int xd_build_l2p_tbl(struct rtsx_chip *chip, int zone_no)dev_dbg (rtsx_dev (chip),"start block 0x%x, end block 0x%x\n" , start, end); - zone->set_index = zone->get_index =0 ; + zone->set_index =0 ; + zone->get_index =0 ; zone->unused_blk_cnt =0 ;for (i = start; i < end; i++) {
Signature · 1 line
2.1.4