staging: rts5208: Checkpatch.pl cleanup
cover staging: rts5208: Checkpatch.pl cleanup
This set is a general clenup of issues found by checkpatch.pl. There are a few checks still detected and these either require more knowledge of the driver or should possibly just be left alone.
Wayne Porter (45):
staging: rts5208: spi.c: Remove unnecessary parenthesis
staging: rts5208: spi.c: Alignment fixes
staging: rts5208: sd.h: Alignment fixes
staging: rts5208: sd.c: Remove unnecessary parentheses
staging: rts5208: sd.c: Alignment fixes
staging: rts5208: sd.c: Long line fixes
staging: rts5208: sd.c: CamelCase fixes
staging: rts5208: sd.c: Fix logical continuations
staging: rts5208: sd.c: Spacing cleanup
staging: rts5208: Alignment fixes
staging: rts5208: Unnecessary parentheses cleanup
staging: rts5208: Alignment fix
staging: rts5208: Fix typo in function name
staging: rts5208: Alignment fixes
staging: rts5208: Remove parentheses
staging: rts5208: CamelCase fixes
staging: rts5208: Remove multiple assignment
staging: rts5208: Add braces to if()
staging: rts5208: Add space around operator
staging: rts5208: Alignment fixes
staging: rts5208: Long lines fixes
staging: rts5208: Prefer using BIT macro
staging: rts5208: Parenthesis alignment
staging: rts5208: Unecessary parantheses
staging: rts5208: Parenthesis alignment
staging: rts5208: Unnecessary parentheses
staging: rts5208: Spacing
staging: rts5208: Comparison to NULL
staging: rts5208: rtsx.c: Unnecessary parentheses
staging: rts5208: rtsx.c: Alignment
staging: rts5208: rtsx.c: Multiple assignments
staging: rts5208: rtsx.c: Spacing
staging: rts5208: rtsx.c: CamelCase
staging: rts5208: rtsx.c: Spacing
staging: rts5208: rtsx.c: Alloc sizeof struct
staging: rts5208: ms.h: Parenthesis alignment
staging: rts5208: ms.c: Parenthesis alignment
staging: rts5208: ms.c: Long Lines
staging: rts5208: ms.c: Multiple assignments
staging: rts5208: ms.c: Braces fix
staging: rts5208: CamelCase fix
staging: rts5208: rtsx_scsi.h: Long lines
staging: rts5208: rtxs_chip.h: Long lines
staging: rts5208: rtsx_chip.c: Long lines
staging: rts5208: rtsx.c: Alignment fix
drivers/staging/rts5208/ms.c | 393 ++++++++------- drivers/staging/rts5208/ms.h | 4 +- drivers/staging/rts5208/rtsx.c | 43 +- drivers/staging/rts5208/rtsx.h | 2 +- drivers/staging/rts5208/rtsx_card.c | 94 ++-- drivers/staging/rts5208/rtsx_card.h | 16 +- drivers/staging/rts5208/rtsx_chip.c | 17 +- drivers/staging/rts5208/rtsx_chip.h | 137 ++++-- drivers/staging/rts5208/rtsx_scsi.c | 319 ++++++------ drivers/staging/rts5208/rtsx_scsi.h | 4 +- drivers/staging/rts5208/rtsx_sys.h | 4 +- drivers/staging/rts5208/rtsx_transport.h | 30 +- drivers/staging/rts5208/sd.c | 813 ++++++++++++++++--------------- drivers/staging/rts5208/sd.h | 5 +- drivers/staging/rts5208/spi.c | 144 +++--- 15 files changed, 1075 insertions(+), 950 deletions(-)
Signature · 1 line
2.1.4
PATCH 1/45 staging: rts5208: spi.c: Remove unnecessary parenthesis
Style warnings found by checkpatch
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/spi.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/staging/rts5208/spi.c +7 -7
@@ -29,7 +29,7 @@static inline void spi_set_err_code (struct rtsx_chip *chip,u8 err_code) { -struct spi_info *spi = &(chip->spi); +struct spi_info *spi = &chip->spi; spi->err_code = err_code; }
@@ -57,7 +57,7 @@ static int spi_init(struct rtsx_chip *chip)static int spi_set_init_para (struct rtsx_chip *chip) { -struct spi_info *spi = &(chip->spi); +struct spi_info *spi = &chip->spi;int retval; retval = rtsx_write_register(chip, SPI_CLK_DIVIDER1, 0xFF,
@@ -134,7 +134,7 @@ static int sf_polling_status(struct rtsx_chip *chip, int msec)static int sf_enable_write (struct rtsx_chip *chip,u8 ins) { -struct spi_info *spi = &(chip->spi); +struct spi_info *spi = &chip->spi;int retval;if (!spi->write_en)
@@ -163,7 +163,7 @@ static int sf_enable_write(struct rtsx_chip *chip, u8 ins)static int sf_disable_write (struct rtsx_chip *chip,u8 ins) { -struct spi_info *spi = &(chip->spi); +struct spi_info *spi = &chip->spi;int retval;if (!spi->write_en)
@@ -518,11 +518,11 @@ int spi_write_eeprom(struct rtsx_chip *chip, u16 addr, u8 val)int spi_get_status (struct scsi_cmnd *srb,struct rtsx_chip *chip) { -struct spi_info *spi = &(chip->spi); +struct spi_info *spi = &chip->spi;dev_dbg (rtsx_dev (chip),"spi_get_status: err_code = 0x%x\n" , spi->err_code); -rtsx_stor_set_xfer_buf (&(spi->err_code), +rtsx_stor_set_xfer_buf (&spi->err_code,min_t (int,scsi_bufflen (srb),1 ), srb);scsi_set_resid (srb,scsi_bufflen (srb) -1 );
@@ -531,7 +531,7 @@ int spi_get_status(struct scsi_cmnd *srb, struct rtsx_chip *chip)int spi_set_parameter (struct scsi_cmnd *srb,struct rtsx_chip *chip) { -struct spi_info *spi = &(chip->spi); +struct spi_info *spi = &chip->spi;spi_set_err_code (chip,SPI_NO_ERR );
Signature · 1 line
2.1.4
PATCH 2/45 staging: rts5208: spi.c: Alignment fixes
In reply to Wayne PorterLining up code with open parantheses found by checkpatch
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/spi.c | 130 +++++++++++++++++++++--------------------- 1 file changed, 65 insertions(+), 65 deletions(-)
drivers/staging/rts5208/spi.c +65 -65
@@ -117,9 +117,9 @@ static int sf_polling_status(struct rtsx_chip *chip, int msec)rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_COMMAND ,0xFF ,SPI_RDSR );rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_TRANSFER0 ,0xFF , -SPI_TRANSFER0_START |SPI_POLLING_MODE0 ); +SPI_TRANSFER0_START |SPI_POLLING_MODE0 );rtsx_add_cmd (chip,CHECK_REG_CMD ,SPI_TRANSFER0 ,SPI_TRANSFER0_END , -SPI_TRANSFER0_END ); +SPI_TRANSFER0_END ); retval =rtsx_send_cmd (chip,0 , msec);if (retval <0 ) {
@@ -144,11 +144,11 @@ static int sf_enable_write(struct rtsx_chip *chip, u8 ins)rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_COMMAND ,0xFF , ins);rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_CA_NUMBER ,0xFF , -SPI_COMMAND_BIT_8 |SPI_ADDRESS_BIT_24 ); +SPI_COMMAND_BIT_8 |SPI_ADDRESS_BIT_24 );rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_TRANSFER0 ,0xFF , -SPI_TRANSFER0_START |SPI_C_MODE0 ); +SPI_TRANSFER0_START |SPI_C_MODE0 );rtsx_add_cmd (chip,CHECK_REG_CMD ,SPI_TRANSFER0 ,SPI_TRANSFER0_END , -SPI_TRANSFER0_END ); +SPI_TRANSFER0_END ); retval =rtsx_send_cmd (chip,0 ,100 );if (retval <0 ) {
@@ -173,11 +173,11 @@ static int sf_disable_write(struct rtsx_chip *chip, u8 ins)rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_COMMAND ,0xFF , ins);rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_CA_NUMBER ,0xFF , -SPI_COMMAND_BIT_8 |SPI_ADDRESS_BIT_24 ); +SPI_COMMAND_BIT_8 |SPI_ADDRESS_BIT_24 );rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_TRANSFER0 ,0xFF , -SPI_TRANSFER0_START |SPI_C_MODE0 ); +SPI_TRANSFER0_START |SPI_C_MODE0 );rtsx_add_cmd (chip,CHECK_REG_CMD ,SPI_TRANSFER0 ,SPI_TRANSFER0_END , -SPI_TRANSFER0_END ); +SPI_TRANSFER0_END ); retval =rtsx_send_cmd (chip,0 ,100 );if (retval <0 ) {
@@ -191,27 +191,27 @@ static int sf_disable_write(struct rtsx_chip *chip, u8 ins) }static void sf_program (struct rtsx_chip *chip,u8 ins,u8 addr_mode,u32 addr, -u16 len) +u16 len) {rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_COMMAND ,0xFF , ins);rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_CA_NUMBER ,0xFF , -SPI_COMMAND_BIT_8 |SPI_ADDRESS_BIT_24 ); +SPI_COMMAND_BIT_8 |SPI_ADDRESS_BIT_24 );rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_LENGTH0 ,0xFF , (u8 )len);rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_LENGTH1 ,0xFF , (u8)(len >>8 ));if (addr_mode) {rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_ADDR0 ,0xFF , (u8 )addr);rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_ADDR1 ,0xFF , - (u8)(addr >>8 )); + (u8)(addr >>8 ));rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_ADDR2 ,0xFF , - (u8)(addr >>16 )); + (u8)(addr >>16 ));rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_TRANSFER0 ,0xFF , -SPI_TRANSFER0_START |SPI_CADO_MODE0 ); +SPI_TRANSFER0_START |SPI_CADO_MODE0 ); }else {rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_TRANSFER0 ,0xFF , -SPI_TRANSFER0_START |SPI_CDO_MODE0 ); +SPI_TRANSFER0_START |SPI_CDO_MODE0 ); }rtsx_add_cmd (chip,CHECK_REG_CMD ,SPI_TRANSFER0 ,SPI_TRANSFER0_END , -SPI_TRANSFER0_END ); +SPI_TRANSFER0_END ); }static int sf_erase (struct rtsx_chip *chip,u8 ins,u8 addr_mode,u32 addr)
@@ -222,21 +222,21 @@ static int sf_erase(struct rtsx_chip *chip, u8 ins, u8 addr_mode, u32 addr)rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_COMMAND ,0xFF , ins);rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_CA_NUMBER ,0xFF , -SPI_COMMAND_BIT_8 |SPI_ADDRESS_BIT_24 ); +SPI_COMMAND_BIT_8 |SPI_ADDRESS_BIT_24 );if (addr_mode) {rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_ADDR0 ,0xFF , (u8 )addr);rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_ADDR1 ,0xFF , - (u8)(addr >>8 )); + (u8)(addr >>8 ));rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_ADDR2 ,0xFF , - (u8)(addr >>16 )); + (u8)(addr >>16 ));rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_TRANSFER0 ,0xFF , -SPI_TRANSFER0_START |SPI_CA_MODE0 ); +SPI_TRANSFER0_START |SPI_CA_MODE0 ); }else {rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_TRANSFER0 ,0xFF , -SPI_TRANSFER0_START |SPI_C_MODE0 ); +SPI_TRANSFER0_START |SPI_C_MODE0 ); }rtsx_add_cmd (chip,CHECK_REG_CMD ,SPI_TRANSFER0 ,SPI_TRANSFER0_END , -SPI_TRANSFER0_END ); +SPI_TRANSFER0_END ); retval =rtsx_send_cmd (chip,0 ,100 );if (retval <0 ) {
@@ -322,9 +322,9 @@ static int spi_eeprom_program_enable(struct rtsx_chip *chip)rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_CA_NUMBER ,0xFF ,0x86 );rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_COMMAND ,0xFF ,0x13 );rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_TRANSFER0 ,0xFF , -SPI_TRANSFER0_START |SPI_CA_MODE0 ); +SPI_TRANSFER0_START |SPI_CA_MODE0 );rtsx_add_cmd (chip,CHECK_REG_CMD ,SPI_TRANSFER0 ,SPI_TRANSFER0_END , -SPI_TRANSFER0_END ); +SPI_TRANSFER0_END ); retval =rtsx_send_cmd (chip,0 ,100 );if (retval <0 ) {
@@ -358,9 +358,9 @@ int spi_erase_eeprom_chip(struct rtsx_chip *chip)rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_COMMAND ,0xFF ,0x12 );rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_CA_NUMBER ,0xFF ,0x84 );rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_TRANSFER0 ,0xFF , -SPI_TRANSFER0_START |SPI_CA_MODE0 ); +SPI_TRANSFER0_START |SPI_CA_MODE0 );rtsx_add_cmd (chip,CHECK_REG_CMD ,SPI_TRANSFER0 ,SPI_TRANSFER0_END , -SPI_TRANSFER0_END ); +SPI_TRANSFER0_END ); retval =rtsx_send_cmd (chip,0 ,100 );if (retval <0 ) {
@@ -402,9 +402,9 @@ int spi_erase_eeprom_byte(struct rtsx_chip *chip, u16 addr)rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_ADDR1 ,0xFF , (u8)(addr >>8 ));rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_CA_NUMBER ,0xFF ,0x46 );rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_TRANSFER0 ,0xFF , -SPI_TRANSFER0_START |SPI_CA_MODE0 ); +SPI_TRANSFER0_START |SPI_CA_MODE0 );rtsx_add_cmd (chip,CHECK_REG_CMD ,SPI_TRANSFER0 ,SPI_TRANSFER0_END , -SPI_TRANSFER0_END ); +SPI_TRANSFER0_END ); retval =rtsx_send_cmd (chip,0 ,100 );if (retval <0 ) {
@@ -442,9 +442,9 @@ int spi_read_eeprom(struct rtsx_chip *chip, u16 addr, u8 *val)rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_CA_NUMBER ,0xFF ,0x46 );rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_LENGTH0 ,0xFF ,1 );rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_TRANSFER0 ,0xFF , -SPI_TRANSFER0_START |SPI_CADI_MODE0 ); +SPI_TRANSFER0_START |SPI_CADI_MODE0 );rtsx_add_cmd (chip,CHECK_REG_CMD ,SPI_TRANSFER0 ,SPI_TRANSFER0_END , -SPI_TRANSFER0_END ); +SPI_TRANSFER0_END ); retval =rtsx_send_cmd (chip,0 ,100 );if (retval <0 ) {
@@ -497,9 +497,9 @@ int spi_write_eeprom(struct rtsx_chip *chip, u16 addr, u8 val)rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_ADDR2 ,0xFF , (u8)(addr >>8 ));rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_CA_NUMBER ,0xFF ,0x4E );rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_TRANSFER0 ,0xFF , -SPI_TRANSFER0_START |SPI_CA_MODE0 ); +SPI_TRANSFER0_START |SPI_CA_MODE0 );rtsx_add_cmd (chip,CHECK_REG_CMD ,SPI_TRANSFER0 ,SPI_TRANSFER0_END , -SPI_TRANSFER0_END ); +SPI_TRANSFER0_END ); retval =rtsx_send_cmd (chip,0 ,100 );if (retval <0 ) {
@@ -523,7 +523,7 @@ int spi_get_status(struct scsi_cmnd *srb, struct rtsx_chip *chip)dev_dbg (rtsx_dev (chip),"spi_get_status: err_code = 0x%x\n" , spi->err_code);rtsx_stor_set_xfer_buf (&spi->err_code, -min_t (int,scsi_bufflen (srb),1 ), srb); +min_t (int,scsi_bufflen (srb),1 ), srb);scsi_set_resid (srb,scsi_bufflen (srb) -1 );return STATUS_SUCCESS ;
@@ -574,37 +574,37 @@ int spi_read_flash_id(struct scsi_cmnd *srb, struct rtsx_chip *chip)rtsx_init_cmd (chip);rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_DATA_SOURCE ,0x01 , -PINGPONG_BUFFER ); +PINGPONG_BUFFER );rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_COMMAND ,0xFF , srb->cmnd[3 ]);rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_ADDR2 ,0xFF , srb->cmnd[4 ]);rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_ADDR1 ,0xFF , srb->cmnd[5 ]);rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_ADDR0 ,0xFF , srb->cmnd[6 ]);rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_CA_NUMBER ,0xFF , -SPI_COMMAND_BIT_8 |SPI_ADDRESS_BIT_24 ); +SPI_COMMAND_BIT_8 |SPI_ADDRESS_BIT_24 );rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_LENGTH1 ,0xFF , srb->cmnd[7 ]);rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_LENGTH0 ,0xFF , srb->cmnd[8 ]);if (len ==0 ) {if (srb->cmnd[9 ]) {rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_TRANSFER0 , -0xFF ,SPI_TRANSFER0_START |SPI_CA_MODE0 ); +0xFF ,SPI_TRANSFER0_START |SPI_CA_MODE0 ); }else {rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_TRANSFER0 , -0xFF ,SPI_TRANSFER0_START |SPI_C_MODE0 ); +0xFF ,SPI_TRANSFER0_START |SPI_C_MODE0 ); } }else {if (srb->cmnd[9 ]) {rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_TRANSFER0 ,0xFF , -SPI_TRANSFER0_START |SPI_CADI_MODE0 ); +SPI_TRANSFER0_START |SPI_CADI_MODE0 ); }else {rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_TRANSFER0 ,0xFF , -SPI_TRANSFER0_START |SPI_CDI_MODE0 ); +SPI_TRANSFER0_START |SPI_CDI_MODE0 ); } }rtsx_add_cmd (chip,CHECK_REG_CMD ,SPI_TRANSFER0 ,SPI_TRANSFER0_END , -SPI_TRANSFER0_END ); +SPI_TRANSFER0_END ); retval =rtsx_send_cmd (chip,0 ,100 );if (retval <0 ) {
@@ -682,38 +682,38 @@ int spi_read_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (slow_read) {rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_ADDR0 ,0xFF , - (u8 )addr); + (u8 )addr);rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_ADDR1 ,0xFF , - (u8)(addr >>8 )); + (u8)(addr >>8 ));rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_ADDR2 ,0xFF , - (u8)(addr >>16 )); + (u8)(addr >>16 ));rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_CA_NUMBER ,0xFF , -SPI_COMMAND_BIT_8 |SPI_ADDRESS_BIT_24 ); +SPI_COMMAND_BIT_8 |SPI_ADDRESS_BIT_24 ); }else {rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_ADDR1 ,0xFF , - (u8 )addr); + (u8 )addr);rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_ADDR2 ,0xFF , - (u8)(addr >>8 )); + (u8)(addr >>8 ));rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_ADDR3 ,0xFF , - (u8)(addr >>16 )); + (u8)(addr >>16 ));rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_CA_NUMBER ,0xFF , -SPI_COMMAND_BIT_8 |SPI_ADDRESS_BIT_32 ); +SPI_COMMAND_BIT_8 |SPI_ADDRESS_BIT_32 ); }rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_LENGTH1 ,0xFF , - (u8)(pagelen >>8 )); + (u8)(pagelen >>8 ));rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_LENGTH0 ,0xFF , - (u8 )pagelen); + (u8 )pagelen);rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_TRANSFER0 ,0xFF , -SPI_TRANSFER0_START |SPI_CADI_MODE0 ); +SPI_TRANSFER0_START |SPI_CADI_MODE0 );rtsx_add_cmd (chip,CHECK_REG_CMD ,SPI_TRANSFER0 , -SPI_TRANSFER0_END ,SPI_TRANSFER0_END ); +SPI_TRANSFER0_END ,SPI_TRANSFER0_END );rtsx_send_cmd_no_wait (chip); retval =rtsx_transfer_data (chip,0 , buf, pagelen,0 , -DMA_FROM_DEVICE ,10000 ); +DMA_FROM_DEVICE ,10000 );if (retval <0 ) {kfree (buf);rtsx_clear_spi_error (chip);
@@ -723,7 +723,7 @@ int spi_read_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip) }rtsx_stor_access_xfer_buf (buf, pagelen, srb, &index, &offset, -TO_XFER_BUF ); +TO_XFER_BUF ); addr += pagelen; len -= pagelen;
@@ -775,14 +775,14 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip) }rtsx_stor_access_xfer_buf (buf,1 , srb, &index, &offset, -FROM_XFER_BUF ); +FROM_XFER_BUF );rtsx_init_cmd (chip);rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_DATA_SOURCE , -0x01 ,PINGPONG_BUFFER ); +0x01 ,PINGPONG_BUFFER );rtsx_add_cmd (chip,WRITE_REG_CMD ,PPBUF_BASE2 ,0xFF , - buf[0 ]); + buf[0 ]);sf_program (chip, ins,1 , addr,1 ); retval =rtsx_send_cmd (chip,0 ,100 );
@@ -824,14 +824,14 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)while (len) {rtsx_stor_access_xfer_buf (buf,1 , srb, &index, &offset, -FROM_XFER_BUF ); +FROM_XFER_BUF );rtsx_init_cmd (chip);rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_DATA_SOURCE , -0x01 ,PINGPONG_BUFFER ); +0x01 ,PINGPONG_BUFFER );rtsx_add_cmd (chip,WRITE_REG_CMD ,PPBUF_BASE2 ,0xFF , - buf[0 ]); + buf[0 ]);if (first_byte) {sf_program (chip, ins,1 , addr,1 ); first_byte =0 ;
@@ -899,10 +899,10 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)rtsx_send_cmd_no_wait (chip);rtsx_stor_access_xfer_buf (buf, pagelen, srb, &index, - &offset,FROM_XFER_BUF ); + &offset,FROM_XFER_BUF ); retval =rtsx_transfer_data (chip,0 , buf, pagelen,0 , -DMA_TO_DEVICE ,100 ); +DMA_TO_DEVICE ,100 );if (retval <0 ) {kfree (buf);rtsx_clear_spi_error (chip);
@@ -1010,18 +1010,18 @@ int spi_write_flash_status(struct scsi_cmnd *srb, struct rtsx_chip *chip)rtsx_init_cmd (chip);rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_DATA_SOURCE ,0x01 , -PINGPONG_BUFFER ); +PINGPONG_BUFFER );rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_COMMAND ,0xFF , ins);rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_CA_NUMBER ,0xFF , -SPI_COMMAND_BIT_8 |SPI_ADDRESS_BIT_24 ); +SPI_COMMAND_BIT_8 |SPI_ADDRESS_BIT_24 );rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_LENGTH1 ,0xFF ,0 );rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_LENGTH0 ,0xFF ,1 );rtsx_add_cmd (chip,WRITE_REG_CMD ,PPBUF_BASE2 ,0xFF , status);rtsx_add_cmd (chip,WRITE_REG_CMD ,SPI_TRANSFER0 ,0xFF , -SPI_TRANSFER0_START |SPI_CDO_MODE0 ); +SPI_TRANSFER0_START |SPI_CDO_MODE0 );rtsx_add_cmd (chip,CHECK_REG_CMD ,SPI_TRANSFER0 ,SPI_TRANSFER0_END , -SPI_TRANSFER0_END ); +SPI_TRANSFER0_END ); retval =rtsx_send_cmd (chip,0 ,100 );if (retval !=STATUS_SUCCESS ) {
Signature · 1 line
2.1.4
PATCH 3/45 staging: rts5208: sd.h: Alignment fixes
In reply to Wayne PorterLining up code with open parenthses found by checkpatch
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/sd.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/staging/rts5208/sd.h +3 -2
@@ -280,14 +280,15 @@ int reset_sd_card(struct rtsx_chip *chip);int sd_switch_clock (struct rtsx_chip *chip);void sd_stop_seq_mode (struct rtsx_chip *chip);int sd_rw (struct scsi_cmnd *srb,struct rtsx_chip *chip, -u32 start_sector,u16 sector_cnt); +u32 start_sector,u16 sector_cnt);void sd_cleanup_work (struct rtsx_chip *chip);int sd_power_off_card3v3 (struct rtsx_chip *chip);int release_sd_card (struct rtsx_chip *chip);#ifdef SUPPORT_CPRM int soft_reset_sd_card (struct rtsx_chip *chip);int ext_sd_send_cmd_get_rsp (struct rtsx_chip *chip,u8 cmd_idx, -u32 arg,u8 rsp_type,u8 *rsp,int rsp_len,bool special_check); +u32 arg,u8 rsp_type,u8 *rsp,int rsp_len, +bool special_check);int ext_sd_get_rsp (struct rtsx_chip *chip,int len,u8 *rsp,u8 rsp_type);int sd_pass_thru_mode (struct scsi_cmnd *srb,struct rtsx_chip *chip);
Signature · 1 line
2.1.4
PATCH 4/45 staging: rts5208: sd.c: Remove unnecessary parentheses
In reply to Wayne PorterCleanup of &(chip->sd_card) to remove parentheses where they are not needed
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/sd.c | 94 ++++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 47 deletions(-)
drivers/staging/rts5208/sd.c +47 -47
@@ -56,21 +56,21 @@ static u16 REG_SD_DCMPS1_CTL;static inline void sd_set_err_code (struct rtsx_chip *chip,u8 err_code) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card; sd_card->err_code |= err_code; }static inline void sd_clr_err_code (struct rtsx_chip *chip) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card; sd_card->err_code =0 ; }static inline int sd_check_err_code (struct rtsx_chip *chip,u8 err_code) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;return sd_card->err_code & err_code; }
@@ -126,7 +126,7 @@ static int sd_check_data0_status(struct rtsx_chip *chip)static int sd_send_cmd_get_rsp (struct rtsx_chip *chip,u8 cmd_idx,u32 arg,u8 rsp_type,u8 *rsp,int rsp_len) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;int retval;int timeout =100 ;u16 reg_addr;
@@ -285,7 +285,7 @@ static int sd_read_data(struct rtsx_chip *chip, u16 blk_cnt, u8 bus_width, u8 *buf, int buf_len, int timeout) { - struct sd_info *sd_card = &(chip->sd_card); + struct sd_info *sd_card = &chip->sd_card;int retval;int i;
@@ -356,7 +356,7 @@ static int sd_write_data(struct rtsx_chip *chip, u8 trans_mode, u8 *cmd, int cmd_len, u16 byte_cnt, u16 blk_cnt, u8 bus_width, u8 *buf, int buf_len, int timeout) { - struct sd_info *sd_card = &(chip->sd_card); + struct sd_info *sd_card = &chip->sd_card;int retval;int i;
@@ -424,7 +424,7 @@ static int sd_write_data(struct rtsx_chip *chip, u8 trans_mode,static int sd_check_csd (struct rtsx_chip *chip,char check_wp) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;int retval;int i;u8 csd_ver, trans_speed;
@@ -534,7 +534,7 @@ static int sd_check_csd(struct rtsx_chip *chip, char check_wp)static int sd_set_sample_push_timing (struct rtsx_chip *chip) {int retval; -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;u8 val =0 ;if ((chip->sd_ctl &SD_PUSH_POINT_CTL_MASK ) ==SD_PUSH_POINT_DELAY )
@@ -573,7 +573,7 @@ static int sd_set_sample_push_timing(struct rtsx_chip *chip)static void sd_choose_proper_clock (struct rtsx_chip *chip) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;if (CHK_SD_SDR104 (sd_card)) {if (chip->asic_code)
@@ -637,7 +637,7 @@ static int sd_set_clock_divider(struct rtsx_chip *chip, u8 clk_div)static int sd_set_init_para (struct rtsx_chip *chip) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;int retval; retval =sd_set_sample_push_timing (chip);
@@ -659,7 +659,7 @@ static int sd_set_init_para(struct rtsx_chip *chip)int sd_select_card (struct rtsx_chip *chip,int select) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;int retval;u8 cmd_idx, cmd_type;u32 addr;
@@ -686,7 +686,7 @@ int sd_select_card(struct rtsx_chip *chip, int select)#ifdef SUPPORT_SD_LOCK static int sd_update_lock_status (struct rtsx_chip *chip) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;int retval;u8 rsp[5 ];
@@ -717,7 +717,7 @@ static int sd_update_lock_status(struct rtsx_chip *chip)static int sd_wait_state_data_ready (struct rtsx_chip *chip,u8 state,u8 data_ready,int polling_cnt) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;int retval, i;u8 rsp[5 ];
@@ -903,7 +903,7 @@ static int sd_reset_dcm(struct rtsx_chip *chip, u8 tune_dir)static int sd_change_phase (struct rtsx_chip *chip,u8 sample_point,u8 tune_dir) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;u16 SD_VP_CTL ,SD_DCMPS_CTL ;u8 val;int retval;
@@ -1060,7 +1060,7 @@ static int sd_change_phase(struct rtsx_chip *chip, u8 sample_point, u8 tune_dir)static int sd_check_spec (struct rtsx_chip *chip,u8 bus_width) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;int retval;u8 cmd[5 ], buf[8 ];
@@ -1217,7 +1217,7 @@ static int sd_query_switch_result(struct rtsx_chip *chip, u8 func_group,static int sd_check_switch_mode (struct rtsx_chip *chip,u8 mode,u8 func_group,u8 func_to_switch,u8 bus_width) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;int retval;u8 cmd[5 ], buf[64 ];
@@ -1379,7 +1379,7 @@ static int sd_check_switch(struct rtsx_chip *chip,static int sd_switch_function (struct rtsx_chip *chip,u8 bus_width) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;int retval;int i;u8 func_to_switch =0 ;
@@ -1611,7 +1611,7 @@ static int sd_sdr_tuning_rx_cmd(struct rtsx_chip *chip, u8 sample_point)static int sd_ddr_tuning_rx_cmd (struct rtsx_chip *chip,u8 sample_point) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;int retval;u8 cmd[5 ];
@@ -1651,7 +1651,7 @@ static int sd_ddr_tuning_rx_cmd(struct rtsx_chip *chip, u8 sample_point)static int mmc_ddr_tunning_rx_cmd (struct rtsx_chip *chip,u8 sample_point) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;int retval;u8 cmd[5 ], bus_width;
@@ -1691,7 +1691,7 @@ static int mmc_ddr_tunning_rx_cmd(struct rtsx_chip *chip, u8 sample_point)static int sd_sdr_tuning_tx_cmd (struct rtsx_chip *chip,u8 sample_point) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;int retval; retval =sd_change_phase (chip, sample_point,TUNE_TX );
@@ -1730,7 +1730,7 @@ static int sd_sdr_tuning_tx_cmd(struct rtsx_chip *chip, u8 sample_point)static int sd_ddr_tuning_tx_cmd (struct rtsx_chip *chip,u8 sample_point) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;int retval;u8 cmd[5 ], bus_width;
@@ -1795,7 +1795,7 @@ static int sd_ddr_tuning_tx_cmd(struct rtsx_chip *chip, u8 sample_point)static u8 sd_search_final_phase (struct rtsx_chip *chip,u32 phase_map,u8 tune_dir) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;struct timing_phase_path path[MAX_PHASE +1 ];int i, j, cont_path_cnt;bool new_block;
@@ -1913,7 +1913,7 @@ static u8 sd_search_final_phase(struct rtsx_chip *chip, u32 phase_map,static int sd_tuning_rx (struct rtsx_chip *chip) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;int retval;int i, j;u32 raw_phase_map[3 ], phase_map;
@@ -1974,7 +1974,7 @@ static int sd_tuning_rx(struct rtsx_chip *chip)static int sd_ddr_pre_tuning_tx (struct rtsx_chip *chip) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;int retval;int i;u32 phase_map;
@@ -2039,7 +2039,7 @@ static int sd_ddr_pre_tuning_tx(struct rtsx_chip *chip)static int sd_tuning_tx (struct rtsx_chip *chip) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;int retval;int i, j;u32 raw_phase_map[3 ], phase_map;
@@ -2193,7 +2193,7 @@ static int mmc_ddr_tuning(struct rtsx_chip *chip)int sd_switch_clock (struct rtsx_chip *chip) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;int retval;int re_tuning =0 ;
@@ -2231,7 +2231,7 @@ int sd_switch_clock(struct rtsx_chip *chip)static int sd_prepare_reset (struct rtsx_chip *chip) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;int retval;if (chip->asic_code)
@@ -2478,7 +2478,7 @@ static int sd_dummy_clock(struct rtsx_chip *chip)static int sd_read_lba0 (struct rtsx_chip *chip) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;int retval;u8 cmd[5 ], bus_width;
@@ -2512,7 +2512,7 @@ static int sd_read_lba0(struct rtsx_chip *chip)static int sd_check_wp_state (struct rtsx_chip *chip) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;int retval;u32 val;u16 sd_card_type;
@@ -2562,7 +2562,7 @@ static int sd_check_wp_state(struct rtsx_chip *chip)static int reset_sd (struct rtsx_chip *chip) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;bool hi_cap_flow = false;int retval, i =0 , j =0 , k =0 ;bool sd_dont_switch = false;
@@ -2925,7 +2925,7 @@ static int reset_sd(struct rtsx_chip *chip)static int mmc_test_switch_bus (struct rtsx_chip *chip,u8 width) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;int retval;u8 buf[8 ] = {0 }, bus_width, *ptr;u16 byte_cnt;
@@ -3054,7 +3054,7 @@ static int mmc_test_switch_bus(struct rtsx_chip *chip, u8 width)static int mmc_switch_timing_bus (struct rtsx_chip *chip,bool switch_ddr) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;int retval;u8 *ptr, card_type, card_type_mask =0 ;
@@ -3178,7 +3178,7 @@ static int mmc_switch_timing_bus(struct rtsx_chip *chip, bool switch_ddr)static int reset_mmc (struct rtsx_chip *chip) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;int retval, i =0 , j =0 , k =0 ;bool switch_ddr = true;u8 rsp[16 ];
@@ -3392,7 +3392,7 @@ static int reset_mmc(struct rtsx_chip *chip)int reset_sd_card (struct rtsx_chip *chip) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;int retval;sd_init_reg_addr (chip);
@@ -3505,7 +3505,7 @@ int reset_sd_card(struct rtsx_chip *chip)static int reset_mmc_only (struct rtsx_chip *chip) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;int retval; sd_card->sd_type =0 ;
@@ -3574,7 +3574,7 @@ static int reset_mmc_only(struct rtsx_chip *chip)static int wait_data_buf_ready (struct rtsx_chip *chip) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;int i, retval;for (i =0 ; i <WAIT_DATA_READY_RTY_CNT ; i++) {
@@ -3607,7 +3607,7 @@ static int wait_data_buf_ready(struct rtsx_chip *chip)void sd_stop_seq_mode (struct rtsx_chip *chip) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;int retval;if (sd_card->seq_mode) {
@@ -3632,7 +3632,7 @@ void sd_stop_seq_mode(struct rtsx_chip *chip)static inline int sd_auto_tune_clock (struct rtsx_chip *chip) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;int retval;if (chip->asic_code) {
@@ -3681,7 +3681,7 @@ static inline int sd_auto_tune_clock(struct rtsx_chip *chip)int sd_rw (struct scsi_cmnd *srb,struct rtsx_chip *chip,u32 start_sector,u16 sector_cnt) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;u32 data_addr;u8 cfg2;int retval;
@@ -4172,7 +4172,7 @@ int ext_sd_get_rsp(struct rtsx_chip *chip, int len, u8 *rsp, u8 rsp_type)int sd_pass_thru_mode (struct scsi_cmnd *srb,struct rtsx_chip *chip) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;unsigned int lun =SCSI_LUN (srb);int len;u8 buf[18 ] = {
@@ -4285,7 +4285,7 @@ static inline int get_rsp_type(struct scsi_cmnd *srb, u8 *rsp_type,int sd_execute_no_data (struct scsi_cmnd *srb,struct rtsx_chip *chip) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;unsigned int lun =SCSI_LUN (srb);int retval, rsp_len;u8 cmd_idx, rsp_type;
@@ -4420,7 +4420,7 @@ int sd_execute_no_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)int sd_execute_read_data (struct scsi_cmnd *srb,struct rtsx_chip *chip) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;unsigned int lun =SCSI_LUN (srb);int retval, rsp_len, i;bool read_err = false, cmd13_checkbit = false;
@@ -4682,7 +4682,7 @@ int sd_execute_read_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)int sd_execute_write_data (struct scsi_cmnd *srb,struct rtsx_chip *chip) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;unsigned int lun =SCSI_LUN (srb);int retval, rsp_len, i;bool write_err = false, cmd13_checkbit = false;
@@ -5062,7 +5062,7 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)int sd_get_cmd_rsp (struct scsi_cmnd *srb,struct rtsx_chip *chip) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;unsigned int lun =SCSI_LUN (srb);int count;u16 data_len;
@@ -5104,7 +5104,7 @@ int sd_get_cmd_rsp(struct scsi_cmnd *srb, struct rtsx_chip *chip)int sd_hw_rst (struct scsi_cmnd *srb,struct rtsx_chip *chip) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;unsigned int lun =SCSI_LUN (srb);int retval;
@@ -5174,7 +5174,7 @@ int sd_hw_rst(struct scsi_cmnd *srb, struct rtsx_chip *chip)void sd_cleanup_work (struct rtsx_chip *chip) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;if (sd_card->seq_mode) {dev_dbg (rtsx_dev (chip),"SD: stop transmission\n" );
@@ -5230,7 +5230,7 @@ int sd_power_off_card3v3(struct rtsx_chip *chip)int release_sd_card (struct rtsx_chip *chip) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;int retval; chip->card_ready &= ~SD_CARD ;
Signature · 1 line
2.1.4
PATCH 5/45 staging: rts5208: sd.c: Alignment fixes
In reply to Wayne PorterLining up with open parenthesis found by checkpatch
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/sd.c | 492 ++++++++++++++++++++++--------------------- 1 file changed, 255 insertions(+), 237 deletions(-)
drivers/staging/rts5208/sd.c +255 -237
@@ -124,7 +124,7 @@ static int sd_check_data0_status(struct rtsx_chip *chip) }static int sd_send_cmd_get_rsp (struct rtsx_chip *chip,u8 cmd_idx, -u32 arg,u8 rsp_type,u8 *rsp,int rsp_len) +u32 arg,u8 rsp_type,u8 *rsp,int rsp_len) {struct sd_info *sd_card = &chip->sd_card;int retval;
@@ -153,11 +153,12 @@ static int sd_send_cmd_get_rsp(struct rtsx_chip *chip, u8 cmd_idx,rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_CFG2 ,0xFF , rsp_type);rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_DATA_SOURCE , -0x01 ,PINGPONG_BUFFER ); +0x01 ,PINGPONG_BUFFER );rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_TRANSFER , -0xFF ,SD_TM_CMD_RSP |SD_TRANSFER_START ); +0xFF ,SD_TM_CMD_RSP |SD_TRANSFER_START );rtsx_add_cmd (chip,CHECK_REG_CMD ,REG_SD_TRANSFER , -SD_TRANSFER_END |SD_STAT_IDLE ,SD_TRANSFER_END |SD_STAT_IDLE ); +SD_TRANSFER_END |SD_STAT_IDLE ,SD_TRANSFER_END | +SD_STAT_IDLE );if (rsp_type ==SD_RSP_TYPE_R2 ) { for (reg_addr = PPBUF_BASE2; reg_addr < PPBUF_BASE2 + 16;
@@ -238,7 +239,7 @@ static int sd_send_cmd_get_rsp(struct rtsx_chip *chip, u8 cmd_idx,if ((rsp_type ==SD_RSP_TYPE_R1 ) || (rsp_type == SD_RSP_TYPE_R1b)) {if ((cmd_idx !=SEND_RELATIVE_ADDR ) && - (cmd_idx !=SEND_IF_COND )) { + (cmd_idx !=SEND_IF_COND )) {if (cmd_idx !=STOP_TRANSMISSION ) {if (ptr[1 ] &0x80 ) {rtsx_trace (chip);
@@ -308,27 +309,27 @@ static int sd_read_data(struct rtsx_chip *chip, 0xFF, cmd[i]); }rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_BYTE_CNT_L ,0xFF , - (u8 )byte_cnt); + (u8 )byte_cnt);rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_BYTE_CNT_H ,0xFF , - (u8)(byte_cnt >>8 )); + (u8)(byte_cnt >>8 ));rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_BLOCK_CNT_L ,0xFF , - (u8 )blk_cnt); + (u8 )blk_cnt);rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_BLOCK_CNT_H ,0xFF , - (u8)(blk_cnt >>8 )); + (u8)(blk_cnt >>8 ));rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_CFG1 ,0x03 , bus_width);rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_CFG2 ,0xFF , -SD_CALCULATE_CRC7 |SD_CHECK_CRC16 |SD_NO_WAIT_BUSY_END | -SD_CHECK_CRC7 |SD_RSP_LEN_6 ); +SD_CALCULATE_CRC7 |SD_CHECK_CRC16 |SD_NO_WAIT_BUSY_END | +SD_CHECK_CRC7 |SD_RSP_LEN_6 );if (trans_mode !=SD_TM_AUTO_TUNING )rtsx_add_cmd (chip,WRITE_REG_CMD , -CARD_DATA_SOURCE ,0x01 ,PINGPONG_BUFFER ); +CARD_DATA_SOURCE ,0x01 ,PINGPONG_BUFFER );rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_TRANSFER ,0xFF , - trans_mode |SD_TRANSFER_START ); + trans_mode |SD_TRANSFER_START );rtsx_add_cmd (chip,CHECK_REG_CMD ,REG_SD_TRANSFER ,SD_TRANSFER_END , -SD_TRANSFER_END ); +SD_TRANSFER_END ); retval =rtsx_send_cmd (chip,SD_CARD , timeout);if (retval <0 ) {
@@ -353,8 +354,8 @@ static int sd_read_data(struct rtsx_chip *chip, }static int sd_write_data (struct rtsx_chip *chip,u8 trans_mode, -u8 *cmd,int cmd_len,u16 byte_cnt,u16 blk_cnt,u8 bus_width, -u8 *buf,int buf_len,int timeout) +u8 *cmd,int cmd_len,u16 byte_cnt,u16 blk_cnt, +u8 bus_width,u8 *buf,int buf_len,int timeout) {struct sd_info *sd_card = &chip->sd_card;int retval;
@@ -389,30 +390,30 @@ static int sd_write_data(struct rtsx_chip *chip, u8 trans_mode, } }rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_BYTE_CNT_L ,0xFF , - (u8 )byte_cnt); + (u8 )byte_cnt);rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_BYTE_CNT_H ,0xFF , - (u8)(byte_cnt >>8 )); + (u8)(byte_cnt >>8 ));rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_BLOCK_CNT_L ,0xFF , - (u8 )blk_cnt); + (u8 )blk_cnt);rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_BLOCK_CNT_H ,0xFF , - (u8)(blk_cnt >>8 )); + (u8)(blk_cnt >>8 ));rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_CFG1 ,0x03 , bus_width);rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_CFG2 ,0xFF , -SD_CALCULATE_CRC7 |SD_CHECK_CRC16 |SD_NO_WAIT_BUSY_END | -SD_CHECK_CRC7 |SD_RSP_LEN_6 ); +SD_CALCULATE_CRC7 |SD_CHECK_CRC16 |SD_NO_WAIT_BUSY_END | +SD_CHECK_CRC7 |SD_RSP_LEN_6 );rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_TRANSFER ,0xFF , - trans_mode |SD_TRANSFER_START ); + trans_mode |SD_TRANSFER_START );rtsx_add_cmd (chip,CHECK_REG_CMD ,REG_SD_TRANSFER ,SD_TRANSFER_END , -SD_TRANSFER_END ); +SD_TRANSFER_END ); retval =rtsx_send_cmd (chip,SD_CARD , timeout);if (retval <0 ) {if (retval == -ETIMEDOUT ) { -sd_send_cmd_get_rsp (chip,SEND_STATUS , - sd_card->sd_addr,SD_RSP_TYPE_R1 ,NULL ,0 ); +sd_send_cmd_get_rsp (chip,SEND_STATUS , sd_card->sd_addr, +SD_RSP_TYPE_R1 ,NULL ,0 ); }rtsx_trace (chip);
@@ -438,7 +439,7 @@ static int sd_check_csd(struct rtsx_chip *chip, char check_wp) } retval =sd_send_cmd_get_rsp (chip,SEND_CSD , sd_card->sd_addr, -SD_RSP_TYPE_R2 , rsp,16 ); +SD_RSP_TYPE_R2 , rsp,16 );if (retval ==STATUS_SUCCESS )break ; }
@@ -691,7 +692,7 @@ static int sd_update_lock_status(struct rtsx_chip *chip)u8 rsp[5 ]; retval =sd_send_cmd_get_rsp (chip,SEND_STATUS , sd_card->sd_addr, -SD_RSP_TYPE_R1 , rsp,5 ); +SD_RSP_TYPE_R1 , rsp,5 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -715,7 +716,7 @@ static int sd_update_lock_status(struct rtsx_chip *chip)#endif static int sd_wait_state_data_ready (struct rtsx_chip *chip,u8 state, -u8 data_ready,int polling_cnt) +u8 data_ready,int polling_cnt) {struct sd_info *sd_card = &chip->sd_card;int retval, i;
@@ -723,15 +724,15 @@ static int sd_wait_state_data_ready(struct rtsx_chip *chip, u8 state,for (i =0 ; i < polling_cnt; i++) { retval =sd_send_cmd_get_rsp (chip,SEND_STATUS , - sd_card->sd_addr,SD_RSP_TYPE_R1 , rsp, -5 ); + sd_card->sd_addr,SD_RSP_TYPE_R1 , + rsp,5 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ; }if (((rsp[3 ] &0x1E ) == state) && - ((rsp[3 ] &0x01 ) == data_ready)) + ((rsp[3 ] &0x01 ) == data_ready))return STATUS_SUCCESS ; }
@@ -746,8 +747,8 @@ static int sd_change_bank_voltage(struct rtsx_chip *chip, u8 voltage)if (voltage ==SD_IO_3V3 ) {if (chip->asic_code) { retval =rtsx_write_phy_register (chip,0x08 , -0x4FC0 | - chip->phy_voltage); +0x4FC0 | + chip->phy_voltage);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -763,8 +764,8 @@ static int sd_change_bank_voltage(struct rtsx_chip *chip, u8 voltage) }else if (voltage ==SD_IO_1V8 ) {if (chip->asic_code) { retval =rtsx_write_phy_register (chip,0x08 , -0x4C40 | - chip->phy_voltage); +0x4C40 | + chip->phy_voltage);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -800,7 +801,7 @@ static int sd_voltage_switch(struct rtsx_chip *chip) } retval =sd_send_cmd_get_rsp (chip,VOLTAGE_SWITCH ,0 ,SD_RSP_TYPE_R1 , -NULL ,0 ); +NULL ,0 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -851,8 +852,8 @@ static int sd_voltage_switch(struct rtsx_chip *chip) (SD_CMD_STATUS | SD_DAT3_STATUS | SD_DAT2_STATUS | SD_DAT1_STATUS | SD_DAT0_STATUS)) {dev_dbg (rtsx_dev (chip),"SD_BUS_STAT: 0x%x\n" , stat); -rtsx_write_register (chip,SD_BUS_STAT , -SD_CLK_TOGGLE_EN |SD_CLK_FORCE_STOP ,0 ); +rtsx_write_register (chip,SD_BUS_STAT ,SD_CLK_TOGGLE_EN | +SD_CLK_FORCE_STOP ,0 );rtsx_write_register (chip,CARD_CLK_EN ,0xFF ,0 );rtsx_trace (chip);return STATUS_FAIL ;
@@ -992,9 +993,9 @@ static int sd_change_phase(struct rtsx_chip *chip, u8 sample_point, u8 tune_dir)rtsx_init_cmd (chip);rtsx_add_cmd (chip,WRITE_REG_CMD ,SD_DCMPS_CTL ,DCMPS_CHANGE , -DCMPS_CHANGE ); +DCMPS_CHANGE );rtsx_add_cmd (chip,CHECK_REG_CMD ,SD_DCMPS_CTL , -DCMPS_CHANGE_DONE ,DCMPS_CHANGE_DONE ); +DCMPS_CHANGE_DONE ,DCMPS_CHANGE_DONE ); retval =rtsx_send_cmd (chip,SD_CARD ,100 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);
@@ -1065,7 +1066,7 @@ static int sd_check_spec(struct rtsx_chip *chip, u8 bus_width)u8 cmd[5 ], buf[8 ]; retval =sd_send_cmd_get_rsp (chip,APP_CMD , sd_card->sd_addr, -SD_RSP_TYPE_R1 ,NULL ,0 ); +SD_RSP_TYPE_R1 ,NULL ,0 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -1078,7 +1079,7 @@ static int sd_check_spec(struct rtsx_chip *chip, u8 bus_width) cmd[4 ] =0 ; retval =sd_read_data (chip,SD_TM_NORMAL_READ , cmd,5 ,8 ,1 , bus_width, - buf,8 ,250 ); + buf,8 ,250 );if (retval !=STATUS_SUCCESS ) {rtsx_clear_sd_error (chip);rtsx_trace (chip);
@@ -1096,7 +1097,7 @@ static int sd_check_spec(struct rtsx_chip *chip, u8 bus_width) }static int sd_query_switch_result (struct rtsx_chip *chip,u8 func_group, -u8 func_to_switch,u8 *buf,int buf_len) +u8 func_to_switch,u8 *buf,int buf_len) {u8 support_mask =0 , query_switch =0 , switch_busy =0 ;int support_offset =0 , query_switch_offset =0 , check_busy_offset =0 ;
@@ -1198,7 +1199,7 @@ static int sd_query_switch_result(struct rtsx_chip *chip, u8 func_group,if (func_group ==SD_FUNC_GROUP_1 ) {if (!(buf[support_offset] & support_mask) || - ((buf[query_switch_offset] &0x0F ) != query_switch)) { + ((buf[query_switch_offset] &0x0F ) != query_switch)) {rtsx_trace (chip);return STATUS_FAIL ; }
@@ -1206,7 +1207,7 @@ static int sd_query_switch_result(struct rtsx_chip *chip, u8 func_group,/* Check 'Busy Status' */ if ((buf[DATA_STRUCTURE_VER_OFFSET ] ==0x01 ) && - ((buf[check_busy_offset] & switch_busy) == switch_busy)) { + ((buf[check_busy_offset] & switch_busy) == switch_busy)) {rtsx_trace (chip);return STATUS_FAIL ; }
@@ -1214,8 +1215,8 @@ static int sd_query_switch_result(struct rtsx_chip *chip, u8 func_group,return STATUS_SUCCESS ; } -static int sd_check_switch_mode (struct rtsx_chip *chip,u8 mode, -u8 func_group,u8 func_to_switch,u8 bus_width) +static int sd_check_switch_mode (struct rtsx_chip *chip,u8 mode,u8 func_group, +u8 func_to_switch,u8 bus_width) {struct sd_info *sd_card = &chip->sd_card;int retval;
@@ -1247,7 +1248,7 @@ static int sd_check_switch_mode(struct rtsx_chip *chip, u8 mode, } retval =sd_read_data (chip,SD_TM_NORMAL_READ , cmd,5 ,64 ,1 , bus_width, - buf,64 ,250 ); + buf,64 ,250 );if (retval !=STATUS_SUCCESS ) {rtsx_clear_sd_error (chip);rtsx_trace (chip);
@@ -1326,7 +1327,7 @@ static u8 downgrade_switch_mode(u8 func_group, u8 func_to_switch) }static int sd_check_switch (struct rtsx_chip *chip, -u8 func_group,u8 func_to_switch,u8 bus_width) +u8 func_group,u8 func_to_switch,u8 bus_width) {int retval;int i;
@@ -1340,12 +1341,14 @@ static int sd_check_switch(struct rtsx_chip *chip, } retval =sd_check_switch_mode (chip,SD_CHECK_MODE , func_group, - func_to_switch, bus_width); + func_to_switch, bus_width);if (retval ==STATUS_SUCCESS ) {u8 stat; retval =sd_check_switch_mode (chip,SD_SWITCH_MODE , - func_group, func_to_switch, bus_width); + func_group, + func_to_switch, + bus_width);if (retval ==STATUS_SUCCESS ) { switch_good = true;break ;
@@ -1364,7 +1367,7 @@ static int sd_check_switch(struct rtsx_chip *chip, } func_to_switch =downgrade_switch_mode (func_group, - func_to_switch); + func_to_switch);wait_timeout (20 ); }
@@ -1385,8 +1388,8 @@ static int sd_switch_function(struct rtsx_chip *chip, u8 bus_width)u8 func_to_switch =0 ;/* Get supported functions */ - retval =sd_check_switch_mode (chip,SD_CHECK_MODE , -NO_ARGUMENT ,NO_ARGUMENT , bus_width); + retval =sd_check_switch_mode (chip,SD_CHECK_MODE ,NO_ARGUMENT , +NO_ARGUMENT , bus_width);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -1446,7 +1449,7 @@ static int sd_switch_function(struct rtsx_chip *chip, u8 bus_width)if (func_to_switch) { retval =sd_check_switch (chip,SD_FUNC_GROUP_1 , func_to_switch, - bus_width); + bus_width);if (retval !=STATUS_SUCCESS ) {if (func_to_switch ==SDR104_SUPPORT ) { sd_card->sd_switch_fail =SDR104_SUPPORT_MASK ;
@@ -1534,7 +1537,7 @@ static int sd_switch_function(struct rtsx_chip *chip, u8 bus_width)if (func_to_switch <=CURRENT_LIMIT_800 ) { retval =sd_check_switch (chip,SD_FUNC_GROUP_4 , func_to_switch, - bus_width); + bus_width);if (retval !=STATUS_SUCCESS ) {if (sd_check_err_code (chip,SD_NO_CARD )) {rtsx_trace (chip);
@@ -1596,8 +1599,8 @@ static int sd_sdr_tuning_rx_cmd(struct rtsx_chip *chip, u8 sample_point) cmd[3 ] =0 ; cmd[4 ] =0 ; - retval =sd_read_data (chip,SD_TM_AUTO_TUNING , - cmd,5 ,0x40 ,1 ,SD_BUS_WIDTH_4 ,NULL ,0 ,100 ); + retval =sd_read_data (chip,SD_TM_AUTO_TUNING , cmd,5 ,0x40 ,1 , +SD_BUS_WIDTH_4 ,NULL ,0 ,100 );if (retval !=STATUS_SUCCESS ) { (void )sd_wait_data_idle (chip);
@@ -1624,7 +1627,7 @@ static int sd_ddr_tuning_rx_cmd(struct rtsx_chip *chip, u8 sample_point)dev_dbg (rtsx_dev (chip),"sd ddr tuning rx\n" ); retval =sd_send_cmd_get_rsp (chip,APP_CMD , sd_card->sd_addr, -SD_RSP_TYPE_R1 ,NULL ,0 ); +SD_RSP_TYPE_R1 ,NULL ,0 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -1636,8 +1639,8 @@ static int sd_ddr_tuning_rx_cmd(struct rtsx_chip *chip, u8 sample_point) cmd[3 ] =0 ; cmd[4 ] =0 ; - retval =sd_read_data (chip,SD_TM_NORMAL_READ , - cmd,5 ,64 ,1 ,SD_BUS_WIDTH_4 ,NULL ,0 ,100 ); + retval =sd_read_data (chip,SD_TM_NORMAL_READ , cmd,5 ,64 ,1 , +SD_BUS_WIDTH_4 ,NULL ,0 ,100 );if (retval !=STATUS_SUCCESS ) { (void )sd_wait_data_idle (chip);
@@ -1676,8 +1679,8 @@ static int mmc_ddr_tunning_rx_cmd(struct rtsx_chip *chip, u8 sample_point) cmd[3 ] =0 ; cmd[4 ] =0 ; - retval =sd_read_data (chip,SD_TM_NORMAL_READ , - cmd,5 ,0x200 ,1 , bus_width,NULL ,0 ,100 ); + retval =sd_read_data (chip,SD_TM_NORMAL_READ , cmd,5 ,0x200 ,1 , + bus_width,NULL ,0 ,100 );if (retval !=STATUS_SUCCESS ) { (void )sd_wait_data_idle (chip);
@@ -1708,11 +1711,11 @@ static int sd_sdr_tuning_tx_cmd(struct rtsx_chip *chip, u8 sample_point) } retval =sd_send_cmd_get_rsp (chip,SEND_STATUS , sd_card->sd_addr, -SD_RSP_TYPE_R1 ,NULL ,0 ); +SD_RSP_TYPE_R1 ,NULL ,0 );if (retval !=STATUS_SUCCESS ) {if (sd_check_err_code (chip,SD_RSP_TIMEOUT )) {rtsx_write_register (chip,SD_CFG3 , -SD_RSP_80CLK_TIMEOUT_EN ,0 ); +SD_RSP_80CLK_TIMEOUT_EN ,0 );rtsx_trace (chip);return STATUS_FAIL ; }
@@ -1770,8 +1773,8 @@ static int sd_ddr_tuning_tx_cmd(struct rtsx_chip *chip, u8 sample_point) cmd[3 ] =0 ; cmd[4 ] =0 ; - retval =sd_write_data (chip,SD_TM_AUTO_WRITE_2 , - cmd,5 ,16 ,1 , bus_width, sd_card->raw_csd,16 ,100 ); + retval =sd_write_data (chip,SD_TM_AUTO_WRITE_2 , cmd,5 ,16 ,1 , + bus_width, sd_card->raw_csd,16 ,100 );if (retval !=STATUS_SUCCESS ) {rtsx_clear_sd_error (chip);rtsx_write_register (chip,SD_CFG3 ,SD_RSP_80CLK_TIMEOUT_EN ,0 );
@@ -1787,7 +1790,7 @@ static int sd_ddr_tuning_tx_cmd(struct rtsx_chip *chip, u8 sample_point) }sd_send_cmd_get_rsp (chip,SEND_STATUS , sd_card->sd_addr,SD_RSP_TYPE_R1 , -NULL ,0 ); +NULL ,0 );return STATUS_SUCCESS ; }
@@ -1848,7 +1851,7 @@ static u8 sd_search_final_phase(struct rtsx_chip *chip, u32 phase_map, }if ((path[0 ].start ==0 ) && - (path[cont_path_cnt -1 ].end ==MAX_PHASE )) { + (path[cont_path_cnt -1 ].end ==MAX_PHASE )) { path[0 ].start = path[cont_path_cnt -1 ].start -MAX_PHASE -1 ; path[0 ].len += path[cont_path_cnt -1 ].len; path[0 ].mid = path[0 ].start + path[0 ].len /2 ;
@@ -1992,7 +1995,7 @@ static int sd_ddr_pre_tuning_tx(struct rtsx_chip *chip)if (detect_card_cd (chip,SD_CARD ) !=STATUS_SUCCESS ) {sd_set_err_code (chip,SD_NO_CARD );rtsx_write_register (chip,SD_CFG3 , -SD_RSP_80CLK_TIMEOUT_EN ,0 ); +SD_RSP_80CLK_TIMEOUT_EN ,0 );rtsx_trace (chip);return STATUS_FAIL ; }
@@ -2002,10 +2005,10 @@ static int sd_ddr_pre_tuning_tx(struct rtsx_chip *chip)continue ; retval =sd_send_cmd_get_rsp (chip,SEND_STATUS , - sd_card->sd_addr,SD_RSP_TYPE_R1 ,NULL , -0 ); + sd_card->sd_addr,SD_RSP_TYPE_R1 , +NULL ,0 );if ((retval ==STATUS_SUCCESS ) || - !sd_check_err_code (chip,SD_RSP_TIMEOUT )) + !sd_check_err_code (chip,SD_RSP_TIMEOUT )) phase_map |=1 << i; }
@@ -2131,7 +2134,7 @@ static int sd_ddr_tuning(struct rtsx_chip *chip) } }else { retval =sd_change_phase (chip, (u8 )chip->sd_ddr_tx_phase, -TUNE_TX ); +TUNE_TX );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -2167,7 +2170,7 @@ static int mmc_ddr_tuning(struct rtsx_chip *chip) } }else { retval =sd_change_phase (chip, (u8 )chip->mmc_ddr_tx_phase, -TUNE_TX ); +TUNE_TX );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -2361,27 +2364,27 @@ int sd_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 |SD_DAT7_PU |SD_CLK_NP |SD_D5_PU ); +XD_D3_PD |SD_DAT7_PU |SD_CLK_NP |SD_D5_PU );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_PULL_CTL2 ,0xFF , -SD_D6_PU |SD_D0_PU |SD_D1_PU |XD_D5_PD ); +SD_D6_PU |SD_D0_PU |SD_D1_PU |XD_D5_PD );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_PULL_CTL3 ,0xFF , -SD_D4_PU |XD_CE_PD |XD_CLE_PD |XD_CD_PU ); +SD_D4_PU |XD_CE_PD |XD_CLE_PD |XD_CD_PU );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_PULL_CTL4 ,0xFF , -XD_RDY_PD |SD_D3_PU |SD_D2_PU |XD_ALE_PD ); +XD_RDY_PD |SD_D3_PU |SD_D2_PU |XD_ALE_PD );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_PULL_CTL5 ,0xFF , -MS_INS_PU |SD_WP_PU |SD_CD_PU |SD_CMD_PU ); +MS_INS_PU |SD_WP_PU |SD_CD_PU |SD_CMD_PU );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 , -0xA8 ); +0xA8 );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_PULL_CTL2 ,0xFF , -0x5A ); +0x5A );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_PULL_CTL3 ,0xFF , -0x95 ); +0x95 );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_PULL_CTL4 ,0xFF , -0xAA ); +0xAA ); } }
@@ -2499,8 +2502,8 @@ static int sd_read_lba0(struct rtsx_chip *chip) bus_width =SD_BUS_WIDTH_1 ; } - retval =sd_read_data (chip,SD_TM_NORMAL_READ , cmd, -5 ,512 ,1 , bus_width,NULL ,0 ,100 ); + retval =sd_read_data (chip,SD_TM_NORMAL_READ , cmd,5 ,512 ,1 , + bus_width,NULL ,0 ,100 );if (retval !=STATUS_SUCCESS ) {rtsx_clear_sd_error (chip);rtsx_trace (chip);
@@ -2518,8 +2521,8 @@ static int sd_check_wp_state(struct rtsx_chip *chip)u16 sd_card_type;u8 cmd[5 ], buf[64 ]; - retval =sd_send_cmd_get_rsp (chip,APP_CMD , - sd_card->sd_addr,SD_RSP_TYPE_R1 ,NULL ,0 ); + retval =sd_send_cmd_get_rsp (chip,APP_CMD , sd_card->sd_addr, +SD_RSP_TYPE_R1 ,NULL ,0 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -2532,12 +2535,12 @@ static int sd_check_wp_state(struct rtsx_chip *chip) cmd[4 ] =0 ; retval =sd_read_data (chip,SD_TM_NORMAL_READ , cmd,5 ,64 ,1 , -SD_BUS_WIDTH_4 , buf,64 ,250 ); +SD_BUS_WIDTH_4 , buf,64 ,250 );if (retval !=STATUS_SUCCESS ) {rtsx_clear_sd_error (chip);sd_send_cmd_get_rsp (chip,SEND_STATUS , sd_card->sd_addr, -SD_RSP_TYPE_R1 ,NULL ,0 ); +SD_RSP_TYPE_R1 ,NULL ,0 );rtsx_trace (chip);return STATUS_FAIL ; }
@@ -2605,7 +2608,7 @@ static int reset_sd(struct rtsx_chip *chip) } retval =sd_send_cmd_get_rsp (chip,IO_SEND_OP_COND ,0 , -SD_RSP_TYPE_R4 , rsp,5 ); +SD_RSP_TYPE_R4 , rsp,5 );if (retval ==STATUS_SUCCESS ) {int func_num = (rsp[1 ] >>4 ) &0x07 ;
@@ -2630,14 +2633,14 @@ static int reset_sd(struct rtsx_chip *chip)/* Start Initialization Process of SD Card */ RTY_SD_RST: retval =sd_send_cmd_get_rsp (chip,GO_IDLE_STATE ,0 ,SD_RSP_TYPE_R0 , -NULL ,0 ); +NULL ,0 );if (retval !=STATUS_SUCCESS ) goto Status_Fail;wait_timeout (20 ); retval =sd_send_cmd_get_rsp (chip,SEND_IF_COND ,0x000001AA , -SD_RSP_TYPE_R7 , rsp,5 ); +SD_RSP_TYPE_R7 , rsp,5 );if (retval ==STATUS_SUCCESS ) {if ((rsp[4 ] ==0xAA ) && ((rsp[3 ] &0x0f ) ==0x01 )) { hi_cap_flow = true;
@@ -2649,7 +2652,7 @@ static int reset_sd(struct rtsx_chip *chip) voltage =SUPPORT_VOLTAGE ; retval =sd_send_cmd_get_rsp (chip,GO_IDLE_STATE ,0 , -SD_RSP_TYPE_R0 ,NULL ,0 ); +SD_RSP_TYPE_R0 ,NULL ,0 );if (retval !=STATUS_SUCCESS ) goto Status_Fail;
@@ -2658,7 +2661,7 @@ static int reset_sd(struct rtsx_chip *chip) do { retval = sd_send_cmd_get_rsp(chip, APP_CMD, 0, SD_RSP_TYPE_R1, - NULL, 0); + NULL, 0); if (retval != STATUS_SUCCESS) { if (detect_card_cd(chip, SD_CARD) != STATUS_SUCCESS) { sd_set_err_code(chip, SD_NO_CARD);
@@ -2673,7 +2676,7 @@ static int reset_sd(struct rtsx_chip *chip) } retval =sd_send_cmd_get_rsp (chip,SD_APP_OP_COND , voltage, -SD_RSP_TYPE_R3 , rsp,5 ); +SD_RSP_TYPE_R3 , rsp,5 );if (retval !=STATUS_SUCCESS ) { k++;if (k <3 )
@@ -2709,13 +2712,13 @@ static int reset_sd(struct rtsx_chip *chip) } retval =sd_send_cmd_get_rsp (chip,ALL_SEND_CID ,0 ,SD_RSP_TYPE_R2 , -NULL ,0 ); +NULL ,0 );if (retval !=STATUS_SUCCESS ) goto Status_Fail;for (i =0 ; i <3 ; i++) { retval =sd_send_cmd_get_rsp (chip,SEND_RELATIVE_ADDR ,0 , -SD_RSP_TYPE_R6 , rsp,5 ); +SD_RSP_TYPE_R6 , rsp,5 );if (retval !=STATUS_SUCCESS ) goto Status_Fail;
@@ -2749,23 +2752,23 @@ static int reset_sd(struct rtsx_chip *chip)#endif retval =sd_send_cmd_get_rsp (chip,APP_CMD , sd_card->sd_addr, -SD_RSP_TYPE_R1 ,NULL ,0 ); +SD_RSP_TYPE_R1 ,NULL ,0 );if (retval !=STATUS_SUCCESS ) goto Status_Fail; retval =sd_send_cmd_get_rsp (chip,SET_CLR_CARD_DETECT ,0 , -SD_RSP_TYPE_R1 ,NULL ,0 ); +SD_RSP_TYPE_R1 ,NULL ,0 );if (retval !=STATUS_SUCCESS ) goto Status_Fail;if (support_1v8) { retval =sd_send_cmd_get_rsp (chip,APP_CMD , sd_card->sd_addr, -SD_RSP_TYPE_R1 ,NULL ,0 ); +SD_RSP_TYPE_R1 ,NULL ,0 );if (retval !=STATUS_SUCCESS ) goto Status_Fail; retval =sd_send_cmd_get_rsp (chip,SET_BUS_WIDTH ,2 , -SD_RSP_TYPE_R1 ,NULL ,0 ); +SD_RSP_TYPE_R1 ,NULL ,0 );if (retval !=STATUS_SUCCESS ) goto Status_Fail;
@@ -2775,7 +2778,7 @@ static int reset_sd(struct rtsx_chip *chip) } retval =sd_send_cmd_get_rsp (chip,SET_BLOCKLEN ,0x200 ,SD_RSP_TYPE_R1 , -NULL ,0 ); +NULL ,0 );if (retval !=STATUS_SUCCESS ) goto Status_Fail;
@@ -2819,12 +2822,12 @@ static int reset_sd(struct rtsx_chip *chip)if (!support_1v8) { retval =sd_send_cmd_get_rsp (chip,APP_CMD , sd_card->sd_addr, -SD_RSP_TYPE_R1 ,NULL ,0 ); +SD_RSP_TYPE_R1 ,NULL ,0 );if (retval !=STATUS_SUCCESS ) goto Status_Fail; retval =sd_send_cmd_get_rsp (chip,SET_BUS_WIDTH ,2 , -SD_RSP_TYPE_R1 ,NULL ,0 ); +SD_RSP_TYPE_R1 ,NULL ,0 );if (retval !=STATUS_SUCCESS ) goto Status_Fail; }
@@ -2867,7 +2870,7 @@ static int reset_sd(struct rtsx_chip *chip) }sd_send_cmd_get_rsp (chip,SEND_STATUS , sd_card->sd_addr, -SD_RSP_TYPE_R1 ,NULL ,0 ); +SD_RSP_TYPE_R1 ,NULL ,0 );if (CHK_SD_DDR50 (sd_card)) { retval =sd_wait_state_data_ready (chip,0x08 ,1 ,1000 );
@@ -2932,7 +2935,7 @@ static int mmc_test_switch_bus(struct rtsx_chip *chip, u8 width)int len; retval =sd_send_cmd_get_rsp (chip,BUSTEST_W ,0 ,SD_RSP_TYPE_R1 ,NULL , -0 ); +0 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return SWITCH_FAIL ;
@@ -2957,8 +2960,8 @@ static int mmc_test_switch_bus(struct rtsx_chip *chip, u8 width)return SWITCH_ERR ; } - retval =sd_write_data (chip,SD_TM_AUTO_WRITE_3 , -NULL ,0 , byte_cnt,1 , bus_width, buf, len,100 ); + retval =sd_write_data (chip,SD_TM_AUTO_WRITE_3 ,NULL ,0 , byte_cnt,1 , + bus_width, buf, len,100 );if (retval !=STATUS_SUCCESS ) {rtsx_clear_sd_error (chip);rtsx_write_register (chip,REG_SD_CFG3 ,0x02 ,0 );
@@ -2980,23 +2983,23 @@ static int mmc_test_switch_bus(struct rtsx_chip *chip, u8 width)if (width ==MMC_8BIT_BUS )rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_BYTE_CNT_L , -0xFF ,0x08 ); +0xFF ,0x08 );else rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_BYTE_CNT_L , -0xFF ,0x04 ); +0xFF ,0x04 );rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_BLOCK_CNT_L ,0xFF ,1 );rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_BLOCK_CNT_H ,0xFF ,0 ); -rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_CFG2 ,0xFF , -SD_CALCULATE_CRC7 |SD_NO_CHECK_CRC16 |SD_NO_WAIT_BUSY_END | -SD_CHECK_CRC7 |SD_RSP_LEN_6 ); +rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_CFG2 ,0xFF ,SD_CALCULATE_CRC7 | +SD_NO_CHECK_CRC16 |SD_NO_WAIT_BUSY_END | +SD_CHECK_CRC7 |SD_RSP_LEN_6 );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_DATA_SOURCE ,0x01 , -PINGPONG_BUFFER ); +PINGPONG_BUFFER );rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_TRANSFER ,0xFF , -SD_TM_NORMAL_READ |SD_TRANSFER_START ); +SD_TM_NORMAL_READ |SD_TRANSFER_START );rtsx_add_cmd (chip,CHECK_REG_CMD ,REG_SD_TRANSFER ,SD_TRANSFER_END , -SD_TRANSFER_END ); +SD_TRANSFER_END );rtsx_add_cmd (chip,READ_REG_CMD ,PPBUF_BASE2 ,0 ,0 );if (width ==MMC_8BIT_BUS )
@@ -3024,9 +3027,9 @@ static int mmc_test_switch_bus(struct rtsx_chip *chip, u8 width) arg =0x03B70200 ; retval =sd_send_cmd_get_rsp (chip,SWITCH , arg, - SD_RSP_TYPE_R1b, rsp,5 ); + SD_RSP_TYPE_R1b, rsp,5 );if ((retval ==STATUS_SUCCESS ) && - !(rsp[4 ] &MMC_SWITCH_ERR )) + !(rsp[4 ] &MMC_SWITCH_ERR ))return SWITCH_SUCCESS ; } }else {
@@ -3041,9 +3044,9 @@ static int mmc_test_switch_bus(struct rtsx_chip *chip, u8 width) arg =0x03B70100 ; retval =sd_send_cmd_get_rsp (chip,SWITCH , arg, - SD_RSP_TYPE_R1b, rsp,5 ); + SD_RSP_TYPE_R1b, rsp,5 );if ((retval ==STATUS_SUCCESS ) && - !(rsp[4 ] &MMC_SWITCH_ERR )) + !(rsp[4 ] &MMC_SWITCH_ERR ))return SWITCH_SUCCESS ; } }
@@ -3065,7 +3068,7 @@ static int mmc_switch_timing_bus(struct rtsx_chip *chip, bool switch_ddr)rtsx_init_cmd (chip);rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_CMD0 ,0xFF , -0x40 |SEND_EXT_CSD ); +0x40 |SEND_EXT_CSD );rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_CMD1 ,0xFF ,0 );rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_CMD2 ,0xFF ,0 );rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_CMD3 ,0xFF ,0 );
@@ -3077,14 +3080,14 @@ static int mmc_switch_timing_bus(struct rtsx_chip *chip, bool switch_ddr)rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_BLOCK_CNT_H ,0xFF ,0 );rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_CFG2 ,0xFF , -SD_CALCULATE_CRC7 |SD_CHECK_CRC16 |SD_NO_WAIT_BUSY_END | -SD_CHECK_CRC7 |SD_RSP_LEN_6 ); +SD_CALCULATE_CRC7 |SD_CHECK_CRC16 |SD_NO_WAIT_BUSY_END | +SD_CHECK_CRC7 |SD_RSP_LEN_6 );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_DATA_SOURCE ,0x01 , -PINGPONG_BUFFER ); +PINGPONG_BUFFER );rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_TRANSFER ,0xFF , -SD_TM_NORMAL_READ |SD_TRANSFER_START ); +SD_TM_NORMAL_READ |SD_TRANSFER_START );rtsx_add_cmd (chip,CHECK_REG_CMD ,REG_SD_TRANSFER ,SD_TRANSFER_END , -SD_TRANSFER_END ); +SD_TRANSFER_END );rtsx_add_cmd (chip,READ_REG_CMD ,PPBUF_BASE2 +196 ,0xFF ,0 );rtsx_add_cmd (chip,READ_REG_CMD ,PPBUF_BASE2 +212 ,0xFF ,0 );
@@ -3097,7 +3100,7 @@ static int mmc_switch_timing_bus(struct rtsx_chip *chip, bool switch_ddr)if (retval == -ETIMEDOUT ) {rtsx_clear_sd_error (chip);sd_send_cmd_get_rsp (chip,SEND_STATUS , sd_card->sd_addr, -SD_RSP_TYPE_R1 ,NULL ,0 ); +SD_RSP_TYPE_R1 ,NULL ,0 ); }rtsx_trace (chip);return STATUS_FAIL ;
@@ -3106,7 +3109,7 @@ static int mmc_switch_timing_bus(struct rtsx_chip *chip, bool switch_ddr) ptr =rtsx_get_cmd_data (chip);if (ptr[0 ] &SD_TRANSFER_ERR ) {sd_send_cmd_get_rsp (chip,SEND_STATUS , sd_card->sd_addr, -SD_RSP_TYPE_R1 ,NULL ,0 ); +SD_RSP_TYPE_R1 ,NULL ,0 );rtsx_trace (chip);return STATUS_FAIL ; }
@@ -3132,8 +3135,8 @@ static int mmc_switch_timing_bus(struct rtsx_chip *chip, bool switch_ddr)SET_MMC_26M (sd_card); } - retval =sd_send_cmd_get_rsp (chip,SWITCH , -0x03B90100 , SD_RSP_TYPE_R1b, rsp,5 ); + retval =sd_send_cmd_get_rsp (chip,SWITCH ,0x03B90100 , + SD_RSP_TYPE_R1b, rsp,5 );if ((retval !=STATUS_SUCCESS ) || (rsp[4 ] &MMC_SWITCH_ERR ))CLR_MMC_HS (sd_card); }
@@ -3201,7 +3204,7 @@ static int reset_mmc(struct rtsx_chip *chip) RTY_MMC_RST: retval =sd_send_cmd_get_rsp (chip,GO_IDLE_STATE ,0 ,SD_RSP_TYPE_R0 , -NULL ,0 ); +NULL ,0 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -3215,11 +3218,11 @@ static int reset_mmc(struct rtsx_chip *chip) } retval =sd_send_cmd_get_rsp (chip,SEND_OP_COND , - (SUPPORT_VOLTAGE |0x40000000 ), -SD_RSP_TYPE_R3 , rsp,5 ); + (SUPPORT_VOLTAGE |0x40000000 ), +SD_RSP_TYPE_R3 , rsp,5 );if (retval !=STATUS_SUCCESS ) {if (sd_check_err_code (chip,SD_BUSY ) || -sd_check_err_code (chip,SD_TO_ERR )) { +sd_check_err_code (chip,SD_TO_ERR )) { k++;if (k <20 ) {sd_clr_err_code (chip);
@@ -3255,7 +3258,7 @@ static int reset_mmc(struct rtsx_chip *chip)CLR_MMC_SECTOR_MODE (sd_card); retval =sd_send_cmd_get_rsp (chip,ALL_SEND_CID ,0 ,SD_RSP_TYPE_R2 , -NULL ,0 ); +NULL ,0 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -3263,7 +3266,7 @@ static int reset_mmc(struct rtsx_chip *chip) sd_card->sd_addr =0x00100000 ; retval =sd_send_cmd_get_rsp (chip,SET_RELATIVE_ADDR , sd_card->sd_addr, -SD_RSP_TYPE_R6 , rsp,5 ); +SD_RSP_TYPE_R6 , rsp,5 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -3284,7 +3287,7 @@ static int reset_mmc(struct rtsx_chip *chip) } retval =sd_send_cmd_get_rsp (chip,SET_BLOCKLEN ,0x200 ,SD_RSP_TYPE_R1 , -NULL ,0 ); +NULL ,0 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -3407,7 +3410,7 @@ int reset_sd_card(struct rtsx_chip *chip) }if (chip->ignore_sd &&CHK_SDIO_EXIST (chip) && - !CHK_SDIO_IGNORED (chip)) { + !CHK_SDIO_IGNORED (chip)) {if (chip->asic_code) { retval =sd_pull_ctl_enable (chip);if (retval !=STATUS_SUCCESS ) {
@@ -3416,7 +3419,8 @@ int reset_sd_card(struct rtsx_chip *chip) } }else { retval =rtsx_write_register (chip,FPGA_PULL_CTL , -FPGA_SD_PULL_CTL_BIT |0x20 ,0 ); +FPGA_SD_PULL_CTL_BIT | +0x20 ,0 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -3587,7 +3591,8 @@ static int wait_data_buf_ready(struct rtsx_chip *chip) sd_card->sd_data_buf_ready =0 ; retval =sd_send_cmd_get_rsp (chip,SEND_STATUS , - sd_card->sd_addr,SD_RSP_TYPE_R1 ,NULL ,0 ); + sd_card->sd_addr,SD_RSP_TYPE_R1 , +NULL ,0 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -3616,7 +3621,7 @@ void sd_stop_seq_mode(struct rtsx_chip *chip)return ; retval =sd_send_cmd_get_rsp (chip,STOP_TRANSMISSION ,0 , - SD_RSP_TYPE_R1b,NULL ,0 ); + SD_RSP_TYPE_R1b,NULL ,0 );if (retval !=STATUS_SUCCESS )sd_set_err_code (chip,SD_STS_ERR );
@@ -3679,7 +3684,7 @@ static inline int sd_auto_tune_clock(struct rtsx_chip *chip) }int sd_rw (struct scsi_cmnd *srb,struct rtsx_chip *chip,u32 start_sector, -u16 sector_cnt) +u16 sector_cnt) {struct sd_info *sd_card = &chip->sd_card;u32 data_addr;
@@ -3730,20 +3735,20 @@ int sd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector, }if (sd_card->seq_mode && - ((sd_card->pre_dir != srb->sc_data_direction) || - ((sd_card->pre_sec_addr + sd_card->pre_sec_cnt) != - start_sector))) { + ((sd_card->pre_dir != srb->sc_data_direction) || + ((sd_card->pre_sec_addr + sd_card->pre_sec_cnt) != + start_sector))) {if ((sd_card->pre_sec_cnt <0x80 ) && (sd_card->pre_dir ==DMA_FROM_DEVICE ) && !CHK_SD30_SPEED (sd_card) && !CHK_SD_HS (sd_card) && !CHK_MMC_HS (sd_card)) {sd_send_cmd_get_rsp (chip,SEND_STATUS , sd_card->sd_addr, -SD_RSP_TYPE_R1 ,NULL ,0 ); +SD_RSP_TYPE_R1 ,NULL ,0 ); } - retval =sd_send_cmd_get_rsp (chip,STOP_TRANSMISSION , -0 , SD_RSP_TYPE_R1b,NULL ,0 ); + retval =sd_send_cmd_get_rsp (chip,STOP_TRANSMISSION ,0 , + SD_RSP_TYPE_R1b,NULL ,0 );if (retval !=STATUS_SUCCESS ) { chip->rw_need_retry =1 ;sd_set_err_code (chip,SD_STS_ERR );
@@ -3765,7 +3770,7 @@ int sd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector, && !CHK_SD_HS(sd_card) && !CHK_MMC_HS(sd_card)) {sd_send_cmd_get_rsp (chip,SEND_STATUS , sd_card->sd_addr, -SD_RSP_TYPE_R1 ,NULL ,0 ); +SD_RSP_TYPE_R1 ,NULL ,0 ); } }
@@ -3774,21 +3779,21 @@ int sd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector,rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_BYTE_CNT_L ,0xFF ,0x00 );rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_BYTE_CNT_H ,0xFF ,0x02 );rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_BLOCK_CNT_L ,0xFF , - (u8 )sector_cnt); + (u8 )sector_cnt);rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_BLOCK_CNT_H ,0xFF , - (u8)(sector_cnt >>8 )); + (u8)(sector_cnt >>8 ));rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_DATA_SOURCE ,0x01 ,RING_BUFFER );if (CHK_MMC_8BIT (sd_card))rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_CFG1 , -0x03 ,SD_BUS_WIDTH_8 ); +0x03 ,SD_BUS_WIDTH_8 );else if (CHK_MMC_4BIT (sd_card) ||CHK_SD (sd_card))rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_CFG1 , -0x03 ,SD_BUS_WIDTH_4 ); +0x03 ,SD_BUS_WIDTH_4 );else rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_CFG1 , -0x03 ,SD_BUS_WIDTH_1 ); +0x03 ,SD_BUS_WIDTH_1 );if (sd_card->seq_mode) { cfg2 = SD_NO_CALCULATE_CRC7 | SD_CHECK_CRC16|
@@ -3797,7 +3802,7 @@ int sd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector,rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_CFG2 ,0xFF , cfg2);trans_dma_enable (srb->sc_data_direction, chip, sector_cnt *512 , -DMA_512 ); +DMA_512 );if (srb->sc_data_direction ==DMA_FROM_DEVICE ) { rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_TRANSFER, 0xFF,
@@ -3808,7 +3813,7 @@ int sd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector, }rtsx_add_cmd (chip,CHECK_REG_CMD ,REG_SD_TRANSFER , -SD_TRANSFER_END ,SD_TRANSFER_END ); +SD_TRANSFER_END ,SD_TRANSFER_END );rtsx_send_cmd_no_wait (chip); }else {
@@ -3818,22 +3823,22 @@ int sd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector,rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_CMD0 ,0xFF ,0x40 |READ_MULTIPLE_BLOCK );rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_CMD1 ,0xFF , - (u8)(data_addr >>24 )); + (u8)(data_addr >>24 ));rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_CMD2 ,0xFF , - (u8)(data_addr >>16 )); + (u8)(data_addr >>16 ));rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_CMD3 ,0xFF , - (u8)(data_addr >>8 )); + (u8)(data_addr >>8 ));rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_CMD4 ,0xFF , - (u8 )data_addr); + (u8 )data_addr); cfg2 =SD_CALCULATE_CRC7 |SD_CHECK_CRC16 |SD_NO_WAIT_BUSY_END |SD_CHECK_CRC7 |SD_RSP_LEN_6 ;rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_CFG2 ,0xFF , - cfg2); + cfg2);trans_dma_enable (srb->sc_data_direction, chip, - sector_cnt *512 ,DMA_512 ); + sector_cnt *512 ,DMA_512 );rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_TRANSFER ,0xFF ,SD_TM_AUTO_READ_2 |SD_TRANSFER_START );
@@ -3861,7 +3866,8 @@ int sd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector, } retval =sd_send_cmd_get_rsp (chip,WRITE_MULTIPLE_BLOCK , - data_addr,SD_RSP_TYPE_R1 ,NULL ,0 ); + data_addr,SD_RSP_TYPE_R1 , +NULL ,0 );if (retval !=STATUS_SUCCESS ) { chip->rw_need_retry =1 ;rtsx_trace (chip);
@@ -3874,10 +3880,10 @@ int sd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector,SD_NO_WAIT_BUSY_END |SD_NO_CHECK_CRC7 |SD_RSP_LEN_0 ;rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_CFG2 ,0xFF , - cfg2); + cfg2);trans_dma_enable (srb->sc_data_direction, chip, - sector_cnt *512 ,DMA_512 ); + sector_cnt *512 ,DMA_512 );rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_TRANSFER ,0xFF ,SD_TM_AUTO_WRITE_3 |SD_TRANSFER_START );
@@ -3891,7 +3897,7 @@ int sd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector, } retval =rtsx_transfer_data (chip,SD_CARD ,scsi_sglist (srb), -scsi_bufflen (srb),scsi_sg_count (srb), +scsi_bufflen (srb),scsi_sg_count (srb), srb->sc_data_direction, chip->sd_timeout);if (retval <0 ) {u8 stat =0 ;
@@ -3916,7 +3922,7 @@ int sd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector, chip->rw_need_retry =1 ; retval =sd_send_cmd_get_rsp (chip,STOP_TRANSMISSION ,0 , - SD_RSP_TYPE_R1b,NULL ,0 ); + SD_RSP_TYPE_R1b,NULL ,0 );if (retval !=STATUS_SUCCESS ) {sd_set_err_code (chip,SD_STS_ERR );rtsx_trace (chip);
@@ -3984,8 +3990,9 @@ int soft_reset_sd_card(struct rtsx_chip *chip)return reset_sd (chip); } -int ext_sd_send_cmd_get_rsp (struct rtsx_chip *chip,u8 cmd_idx, -u32 arg,u8 rsp_type,u8 *rsp,int rsp_len,bool special_check) +int ext_sd_send_cmd_get_rsp (struct rtsx_chip *chip,u8 cmd_idx,u32 arg, +u8 rsp_type,u8 *rsp,int rsp_len, +bool special_check) {int retval;int timeout =100 ;
@@ -4011,11 +4018,11 @@ int ext_sd_send_cmd_get_rsp(struct rtsx_chip *chip, u8 cmd_idx,rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_CFG2 ,0xFF , rsp_type);rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_DATA_SOURCE , -0x01 ,PINGPONG_BUFFER ); +0x01 ,PINGPONG_BUFFER );rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_TRANSFER , -0xFF ,SD_TM_CMD_RSP |SD_TRANSFER_START ); +0xFF ,SD_TM_CMD_RSP |SD_TRANSFER_START );rtsx_add_cmd (chip,CHECK_REG_CMD ,REG_SD_TRANSFER ,SD_TRANSFER_END , -SD_TRANSFER_END ); +SD_TRANSFER_END );if (rsp_type ==SD_RSP_TYPE_R2 ) { for (reg_addr = PPBUF_BASE2; reg_addr < PPBUF_BASE2 + 16;
@@ -4084,7 +4091,7 @@ int ext_sd_send_cmd_get_rsp(struct rtsx_chip *chip, u8 cmd_idx, }if ((cmd_idx ==SELECT_CARD ) || (cmd_idx ==APP_CMD ) || - (cmd_idx ==SEND_STATUS ) || (cmd_idx ==STOP_TRANSMISSION )) { + (cmd_idx ==SEND_STATUS ) || (cmd_idx ==STOP_TRANSMISSION )) {if ((cmd_idx !=STOP_TRANSMISSION ) && !special_check) {if (ptr[1 ] &0x80 ) {rtsx_trace (chip);
@@ -4206,9 +4213,9 @@ int sd_pass_thru_mode(struct scsi_cmnd *srb, struct rtsx_chip *chip) }if ((srb->cmnd[2 ] !=0x53 ) || (srb->cmnd[3 ] !=0x44 ) || - (srb->cmnd[4 ] !=0x20 ) || (srb->cmnd[5 ] !=0x43 ) || - (srb->cmnd[6 ] !=0x61 ) || (srb->cmnd[7 ] !=0x72 ) || - (srb->cmnd[8 ] !=0x64 )) { + (srb->cmnd[4 ] !=0x20 ) || (srb->cmnd[5 ] !=0x43 ) || + (srb->cmnd[6 ] !=0x61 ) || (srb->cmnd[7 ] !=0x72 ) || + (srb->cmnd[8 ] !=0x64 )) {set_sense_type (chip, lun,SENSE_TYPE_MEDIA_INVALID_CMD_FIELD );rtsx_trace (chip);return TRANSPORT_FAILED ;
@@ -4245,7 +4252,7 @@ int sd_pass_thru_mode(struct scsi_cmnd *srb, struct rtsx_chip *chip) }static inline int get_rsp_type (struct scsi_cmnd *srb,u8 *rsp_type, -int *rsp_len) +int *rsp_len) {if (!rsp_type || !rsp_len)return STATUS_FAIL ;
@@ -4339,7 +4346,7 @@ int sd_execute_no_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)if ((sd_card->sd_lock_status &SD_LOCK_1BIT_MODE ) ==0 ) {if (CHK_MMC_8BIT (sd_card)) { retval =rtsx_write_register (chip,REG_SD_CFG1 ,0x03 , -SD_BUS_WIDTH_8 ); +SD_BUS_WIDTH_8 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return TRANSPORT_FAILED ;
@@ -4347,7 +4354,7 @@ int sd_execute_no_data(struct scsi_cmnd *srb, struct rtsx_chip *chip) }else if (CHK_SD (sd_card) ||CHK_MMC_4BIT (sd_card)) { retval =rtsx_write_register (chip,REG_SD_CFG1 ,0x03 , -SD_BUS_WIDTH_4 ); +SD_BUS_WIDTH_4 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return TRANSPORT_FAILED ;
@@ -4372,8 +4379,9 @@ int sd_execute_no_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (acmd) { retval =ext_sd_send_cmd_get_rsp (chip,APP_CMD , - sd_card->sd_addr, -SD_RSP_TYPE_R1 ,NULL ,0 , false); + sd_card->sd_addr, +SD_RSP_TYPE_R1 ,NULL ,0 , + false);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); goto SD_Execute_Cmd_Failed;
@@ -4381,7 +4389,7 @@ int sd_execute_no_data(struct scsi_cmnd *srb, struct rtsx_chip *chip) } retval =ext_sd_send_cmd_get_rsp (chip, cmd_idx, arg, rsp_type, - sd_card->rsp, rsp_len, false); + sd_card->rsp, rsp_len, false);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); goto SD_Execute_Cmd_Failed;
@@ -4492,7 +4500,8 @@ int sd_execute_read_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (data_len <512 ) { retval =ext_sd_send_cmd_get_rsp (chip,SET_BLOCKLEN , data_len, -SD_RSP_TYPE_R1 ,NULL ,0 , false); +SD_RSP_TYPE_R1 ,NULL ,0 , + false);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); goto SD_Execute_Read_Cmd_Failed;
@@ -4509,8 +4518,9 @@ int sd_execute_read_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (acmd) { retval =ext_sd_send_cmd_get_rsp (chip,APP_CMD , - sd_card->sd_addr, -SD_RSP_TYPE_R1 ,NULL ,0 , false); + sd_card->sd_addr, +SD_RSP_TYPE_R1 ,NULL ,0 , + false);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); goto SD_Execute_Read_Cmd_Failed;
@@ -4539,7 +4549,7 @@ int sd_execute_read_data(struct scsi_cmnd *srb, struct rtsx_chip *chip) } retval =sd_read_data (chip,SD_TM_NORMAL_READ , cmd,5 , byte_cnt, - blk_cnt, bus_width, buf, data_len,2000 ); + blk_cnt, bus_width, buf, data_len,2000 );if (retval !=STATUS_SUCCESS ) { read_err = true;kfree (buf);
@@ -4558,24 +4568,24 @@ int sd_execute_read_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)trans_dma_enable (DMA_FROM_DEVICE , chip, data_len,DMA_512 );rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_BYTE_CNT_H ,0xFF , -0x02 ); +0x02 );rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_BYTE_CNT_L ,0xFF , -0x00 ); +0x00 );rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_BLOCK_CNT_H , -0xFF , (srb->cmnd[7 ] &0xFE ) >>1 ); +0xFF , (srb->cmnd[7 ] &0xFE ) >>1 );rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_BLOCK_CNT_L , -0xFF , (u8)((data_len &0x0001FE00 ) >>9 )); +0xFF , (u8)((data_len &0x0001FE00 ) >>9 ));rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_CMD0 ,0xFF , -0x40 | cmd_idx); +0x40 | cmd_idx);rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_CMD1 ,0xFF , - srb->cmnd[3 ]); + srb->cmnd[3 ]);rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_CMD2 ,0xFF , - srb->cmnd[4 ]); + srb->cmnd[4 ]);rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_CMD3 ,0xFF , - srb->cmnd[5 ]); + srb->cmnd[5 ]);rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_CMD4 ,0xFF , - srb->cmnd[6 ]); + srb->cmnd[6 ]);rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_CFG1 ,0x03 , bus_width);rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_CFG2 ,0xFF , rsp_type);
@@ -4583,13 +4593,14 @@ int sd_execute_read_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_TRANSFER ,0xFF ,SD_TM_AUTO_READ_2 |SD_TRANSFER_START );rtsx_add_cmd (chip,CHECK_REG_CMD ,REG_SD_TRANSFER , -SD_TRANSFER_END ,SD_TRANSFER_END ); +SD_TRANSFER_END ,SD_TRANSFER_END );rtsx_send_cmd_no_wait (chip); retval =rtsx_transfer_data (chip,SD_CARD ,scsi_sglist (srb), -scsi_bufflen (srb),scsi_sg_count (srb), -DMA_FROM_DEVICE ,10000 ); +scsi_bufflen (srb), +scsi_sg_count (srb), +DMA_FROM_DEVICE ,10000 );if (retval <0 ) { read_err = true;rtsx_clear_sd_error (chip);
@@ -4617,8 +4628,9 @@ int sd_execute_read_data(struct scsi_cmnd *srb, struct rtsx_chip *chip) }if (send_cmd12) { - retval =ext_sd_send_cmd_get_rsp (chip,STOP_TRANSMISSION , -0 , SD_RSP_TYPE_R1b,NULL ,0 , false); + retval =ext_sd_send_cmd_get_rsp (chip,STOP_TRANSMISSION ,0 , + SD_RSP_TYPE_R1b,NULL ,0 , + false);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); goto SD_Execute_Read_Cmd_Failed;
@@ -4627,7 +4639,8 @@ int sd_execute_read_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (data_len <512 ) { retval =ext_sd_send_cmd_get_rsp (chip,SET_BLOCKLEN ,0x200 , -SD_RSP_TYPE_R1 ,NULL ,0 , false); +SD_RSP_TYPE_R1 ,NULL ,0 , + false);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); goto SD_Execute_Read_Cmd_Failed;
@@ -4651,7 +4664,7 @@ int sd_execute_read_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)for (i =0 ; i <3 ; i++) { retval =ext_sd_send_cmd_get_rsp (chip,SEND_STATUS , - sd_card->sd_addr, + sd_card->sd_addr,SD_RSP_TYPE_R1 ,NULL ,0 , cmd13_checkbit);if (retval ==STATUS_SUCCESS )
@@ -4754,7 +4767,7 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)if ((sd_card->sd_lock_status &SD_LOCK_1BIT_MODE ) ==0 ) {if (CHK_MMC_8BIT (sd_card)) { retval =rtsx_write_register (chip,REG_SD_CFG1 ,0x03 , -SD_BUS_WIDTH_8 ); +SD_BUS_WIDTH_8 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return TRANSPORT_FAILED ;
@@ -4762,7 +4775,7 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip) }else if (CHK_SD (sd_card) ||CHK_MMC_4BIT (sd_card)) { retval =rtsx_write_register (chip,REG_SD_CFG1 ,0x03 , -SD_BUS_WIDTH_4 ); +SD_BUS_WIDTH_4 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return TRANSPORT_FAILED ;
@@ -4779,7 +4792,8 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (data_len <512 ) { retval =ext_sd_send_cmd_get_rsp (chip,SET_BLOCKLEN , data_len, -SD_RSP_TYPE_R1 ,NULL ,0 , false); +SD_RSP_TYPE_R1 ,NULL ,0 , + false);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); goto SD_Execute_Write_Cmd_Failed;
@@ -4796,8 +4810,9 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (acmd) { retval =ext_sd_send_cmd_get_rsp (chip,APP_CMD , - sd_card->sd_addr, -SD_RSP_TYPE_R1 ,NULL ,0 , false); + sd_card->sd_addr, +SD_RSP_TYPE_R1 ,NULL ,0 , + false);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); goto SD_Execute_Write_Cmd_Failed;
@@ -4805,7 +4820,7 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip) } retval =ext_sd_send_cmd_get_rsp (chip, cmd_idx, arg, rsp_type, - sd_card->rsp, rsp_len, false); + sd_card->rsp, rsp_len, false);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); goto SD_Execute_Write_Cmd_Failed;
@@ -4832,7 +4847,7 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)rtsx_init_cmd (chip);for (i =0 ; i <256 ; i++) {rtsx_add_cmd (chip,WRITE_REG_CMD , -PPBUF_BASE2 + i,0xFF , buf[i]); +PPBUF_BASE2 + i,0xFF , buf[i]); } retval =rtsx_send_cmd (chip,0 ,250 );if (retval !=STATUS_SUCCESS ) {
@@ -4844,7 +4859,7 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)rtsx_init_cmd (chip);for (i =256 ; i < data_len; i++) {rtsx_add_cmd (chip,WRITE_REG_CMD , -PPBUF_BASE2 + i,0xFF , buf[i]); +PPBUF_BASE2 + i,0xFF , buf[i]); } retval =rtsx_send_cmd (chip,0 ,250 );if (retval !=STATUS_SUCCESS ) {
@@ -4856,7 +4871,7 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)rtsx_init_cmd (chip);for (i =0 ; i < data_len; i++) {rtsx_add_cmd (chip,WRITE_REG_CMD , -PPBUF_BASE2 + i,0xFF , buf[i]); +PPBUF_BASE2 + i,0xFF , buf[i]); } retval =rtsx_send_cmd (chip,0 ,250 );if (retval !=STATUS_SUCCESS ) {
@@ -4871,20 +4886,20 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)rtsx_init_cmd (chip);rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_BYTE_CNT_H ,0xFF , - srb->cmnd[8 ] &0x03 ); + srb->cmnd[8 ] &0x03 );rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_BYTE_CNT_L ,0xFF , - srb->cmnd[9 ]); + srb->cmnd[9 ]);rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_BLOCK_CNT_H ,0xFF , -0x00 ); +0x00 );rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_BLOCK_CNT_L ,0xFF , -0x01 ); +0x01 );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_DATA_SOURCE ,0x01 , -PINGPONG_BUFFER ); +PINGPONG_BUFFER );rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_TRANSFER ,0xFF ,SD_TM_AUTO_WRITE_3 |SD_TRANSFER_START );rtsx_add_cmd (chip,CHECK_REG_CMD ,REG_SD_TRANSFER , -SD_TRANSFER_END ,SD_TRANSFER_END ); +SD_TRANSFER_END ,SD_TRANSFER_END ); retval =rtsx_send_cmd (chip,SD_CARD ,250 ); }else if (!(data_len &0x1FF )) {
@@ -4893,24 +4908,25 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)trans_dma_enable (DMA_TO_DEVICE , chip, data_len,DMA_512 );rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_BYTE_CNT_H ,0xFF , -0x02 ); +0x02 );rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_BYTE_CNT_L ,0xFF , -0x00 ); +0x00 );rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_BLOCK_CNT_H , -0xFF , (srb->cmnd[7 ] &0xFE ) >>1 ); +0xFF , (srb->cmnd[7 ] &0xFE ) >>1 );rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_BLOCK_CNT_L , -0xFF , (u8)((data_len &0x0001FE00 ) >>9 )); +0xFF , (u8)((data_len &0x0001FE00 ) >>9 ));rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_TRANSFER ,0xFF , -SD_TM_AUTO_WRITE_3 |SD_TRANSFER_START ); +SD_TM_AUTO_WRITE_3 |SD_TRANSFER_START );rtsx_add_cmd (chip,CHECK_REG_CMD ,REG_SD_TRANSFER , -SD_TRANSFER_END ,SD_TRANSFER_END ); +SD_TRANSFER_END ,SD_TRANSFER_END );rtsx_send_cmd_no_wait (chip); retval =rtsx_transfer_data (chip,SD_CARD ,scsi_sglist (srb), -scsi_bufflen (srb),scsi_sg_count (srb), -DMA_TO_DEVICE ,10000 ); +scsi_bufflen (srb), +scsi_sg_count (srb), +DMA_TO_DEVICE ,10000 ); }else {rtsx_trace (chip);
@@ -4954,8 +4970,9 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip) }if (send_cmd12) { - retval =ext_sd_send_cmd_get_rsp (chip,STOP_TRANSMISSION , -0 , SD_RSP_TYPE_R1b,NULL ,0 , false); + retval =ext_sd_send_cmd_get_rsp (chip,STOP_TRANSMISSION ,0 , + SD_RSP_TYPE_R1b,NULL ,0 , + false);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); goto SD_Execute_Write_Cmd_Failed;
@@ -4964,7 +4981,8 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (data_len <512 ) { retval =ext_sd_send_cmd_get_rsp (chip,SET_BLOCKLEN ,0x200 , -SD_RSP_TYPE_R1 ,NULL ,0 , false); +SD_RSP_TYPE_R1 ,NULL ,0 , + false);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); goto SD_Execute_Write_Cmd_Failed;
@@ -4988,9 +5006,9 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)for (i =0 ; i <3 ; i++) { retval =ext_sd_send_cmd_get_rsp (chip,SEND_STATUS , - sd_card->sd_addr, -SD_RSP_TYPE_R1 ,NULL ,0 , - cmd13_checkbit); + sd_card->sd_addr, +SD_RSP_TYPE_R1 ,NULL ,0 , + cmd13_checkbit);if (retval ==STATUS_SUCCESS )break ; }
@@ -5122,9 +5140,9 @@ int sd_hw_rst(struct scsi_cmnd *srb, struct rtsx_chip *chip) }if ((srb->cmnd[2 ] !=0x53 ) || (srb->cmnd[3 ] !=0x44 ) || - (srb->cmnd[4 ] !=0x20 ) || (srb->cmnd[5 ] !=0x43 ) || - (srb->cmnd[6 ] !=0x61 ) || (srb->cmnd[7 ] !=0x72 ) || - (srb->cmnd[8 ] !=0x64 )) { + (srb->cmnd[4 ] !=0x20 ) || (srb->cmnd[5 ] !=0x43 ) || + (srb->cmnd[6 ] !=0x61 ) || (srb->cmnd[7 ] !=0x72 ) || + (srb->cmnd[8 ] !=0x64 )) {set_sense_type (chip, lun,SENSE_TYPE_MEDIA_INVALID_CMD_FIELD );rtsx_trace (chip);return TRANSPORT_FAILED ;
Signature · 1 line
2.1.4
PATCH 6/45 staging: rts5208: sd.c: Long line fixes
In reply to Wayne PorterBreak up lines over 80 characters
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/sd.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-)
drivers/staging/rts5208/sd.c +15 -7
@@ -969,7 +969,9 @@ static int sd_change_phase(struct rtsx_chip *chip, u8 sample_point, u8 tune_dir) }udelay (50 ); retval =rtsx_write_register (chip,SD_VP_CTL ,0xFF , -PHASE_CHANGE |PHASE_NOT_RESET | sample_point); +PHASE_CHANGE | +PHASE_NOT_RESET | + sample_point);if (retval) {rtsx_trace (chip);return retval;
@@ -983,7 +985,8 @@ static int sd_change_phase(struct rtsx_chip *chip, u8 sample_point, u8 tune_dir) }udelay (50 ); retval =rtsx_write_register (chip,SD_VP_CTL ,0xFF , -PHASE_NOT_RESET | sample_point); +PHASE_NOT_RESET | + sample_point);if (retval) {rtsx_trace (chip);return retval;
@@ -2289,31 +2292,36 @@ static int sd_pull_ctl_disable(struct rtsx_chip *chip)if (CHECK_PID (chip,0x5208 )) { retval =rtsx_write_register (chip,CARD_PULL_CTL1 ,0xFF , -XD_D3_PD |SD_D7_PD |SD_CLK_PD |SD_D5_PD ); +XD_D3_PD |SD_D7_PD |SD_CLK_PD | +SD_D5_PD );if (retval) {rtsx_trace (chip);return retval; } retval =rtsx_write_register (chip,CARD_PULL_CTL2 ,0xFF , -SD_D6_PD |SD_D0_PD |SD_D1_PD |XD_D5_PD ); +SD_D6_PD |SD_D0_PD |SD_D1_PD | +XD_D5_PD );if (retval) {rtsx_trace (chip);return retval; } retval =rtsx_write_register (chip,CARD_PULL_CTL3 ,0xFF , -SD_D4_PD |XD_CE_PD |XD_CLE_PD |XD_CD_PU ); +SD_D4_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 |SD_D3_PD |SD_D2_PD |XD_ALE_PD ); +XD_RDY_PD |SD_D3_PD |SD_D2_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;
Signature · 1 line
2.1.4
PATCH 7/45 staging: rts5208: sd.c: CamelCase fixes
In reply to Wayne PorterConvert camel case lables to all lowercase
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/sd.c | 168 +++++++++++++++++++++---------------------- 1 file changed, 84 insertions(+), 84 deletions(-)
drivers/staging/rts5208/sd.c +84 -84
@@ -1002,18 +1002,18 @@ static int sd_change_phase(struct rtsx_chip *chip, u8 sample_point, u8 tune_dir) retval =rtsx_send_cmd (chip,SD_CARD ,100 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); - goto Fail; + goto fail; } val = *rtsx_get_cmd_data (chip);if (val &DCMPS_ERROR ) {rtsx_trace (chip); - goto Fail; + goto fail; }if ((val &DCMPS_CURRENT_PHASE ) != sample_point) {rtsx_trace (chip); - goto Fail; + goto fail; } retval = rtsx_write_register(chip, SD_DCMPS_CTL,
@@ -1049,7 +1049,7 @@ static int sd_change_phase(struct rtsx_chip *chip, u8 sample_point, u8 tune_dir)return STATUS_SUCCESS ; -Fail: +fail:rtsx_read_register (chip,SD_VP_CTL , &val);dev_dbg (rtsx_dev (chip),"SD_VP_CTL: 0x%x\n" , val);rtsx_read_register (chip,SD_DCMPS_CTL , &val);
@@ -1814,7 +1814,7 @@ static u8 sd_search_final_phase(struct rtsx_chip *chip, u32 phase_map,else final_phase = (u8 )chip->sd_default_tx_phase; - goto Search_Finish; + goto search_finish; } cont_path_cnt =0 ;
@@ -1845,7 +1845,7 @@ static u8 sd_search_final_phase(struct rtsx_chip *chip, u32 phase_map,if (cont_path_cnt ==0 ) {dev_dbg (rtsx_dev (chip),"No continuous phase path\n" ); - goto Search_Finish; + goto search_finish; }else {int idx = cont_path_cnt -1 ;
@@ -1912,7 +1912,7 @@ static u8 sd_search_final_phase(struct rtsx_chip *chip, u32 phase_map, } } -Search_Finish: +search_finish:dev_dbg (rtsx_dev (chip),"Final chosen phase: %d\n" , final_phase);return final_phase; }
@@ -2586,7 +2586,7 @@ static int reset_sd(struct rtsx_chip *chip)SET_SD (sd_card); -Switch_Fail: +switch_fail: i =0 ; j =0 ;
@@ -2600,11 +2600,11 @@ static int reset_sd(struct rtsx_chip *chip) retval =sd_prepare_reset (chip);if (retval !=STATUS_SUCCESS ) - goto Status_Fail; + goto status_fail; retval =sd_dummy_clock (chip);if (retval !=STATUS_SUCCESS ) - goto Status_Fail; + goto status_fail;if (CHK_SDIO_EXIST (chip) && !CHK_SDIO_IGNORED (chip) && try_sdio) {int rty_cnt =0 ;
@@ -2612,7 +2612,7 @@ static int reset_sd(struct rtsx_chip *chip)for (; rty_cnt < chip->sdio_retry_cnt; rty_cnt++) {if (detect_card_cd (chip,SD_CARD ) !=STATUS_SUCCESS ) {sd_set_err_code (chip,SD_NO_CARD ); - goto Status_Fail; + goto status_fail; } retval = sd_send_cmd_get_rsp(chip, IO_SEND_OP_COND, 0,
@@ -2624,7 +2624,7 @@ static int reset_sd(struct rtsx_chip *chip)dev_dbg (rtsx_dev (chip),"SD_IO card (Function number: %d)!\n" , func_num); chip->sd_io =1 ; - goto Status_Fail; + goto status_fail; }break ;
@@ -2643,7 +2643,7 @@ static int reset_sd(struct rtsx_chip *chip) retval =sd_send_cmd_get_rsp (chip,GO_IDLE_STATE ,0 ,SD_RSP_TYPE_R0 ,NULL ,0 );if (retval !=STATUS_SUCCESS ) - goto Status_Fail; + goto status_fail;wait_timeout (20 );
@@ -2662,7 +2662,7 @@ static int reset_sd(struct rtsx_chip *chip) retval =sd_send_cmd_get_rsp (chip,GO_IDLE_STATE ,0 ,SD_RSP_TYPE_R0 ,NULL ,0 );if (retval !=STATUS_SUCCESS ) - goto Status_Fail; + goto status_fail;wait_timeout (20 ); }
@@ -2673,14 +2673,14 @@ static int reset_sd(struct rtsx_chip *chip)if (retval !=STATUS_SUCCESS ) {if (detect_card_cd (chip,SD_CARD ) !=STATUS_SUCCESS ) {sd_set_err_code (chip,SD_NO_CARD ); - goto Status_Fail; + goto status_fail; } j++;if (j <3 ) goto RTY_SD_RST;else - goto Status_Fail; + goto status_fail; } retval = sd_send_cmd_get_rsp(chip, SD_APP_OP_COND, voltage,
@@ -2690,7 +2690,7 @@ static int reset_sd(struct rtsx_chip *chip)if (k <3 ) goto RTY_SD_RST;else - goto Status_Fail; + goto status_fail; } i++;
@@ -2698,7 +2698,7 @@ static int reset_sd(struct rtsx_chip *chip) }while (!(rsp[1 ] &0x80 ) && (i <255 ));if (i ==255 ) - goto Status_Fail; + goto status_fail;if (hi_cap_flow) {if (rsp[1 ] &0x40 )
@@ -2716,19 +2716,19 @@ static int reset_sd(struct rtsx_chip *chip)if (support_1v8) { retval =sd_voltage_switch (chip);if (retval !=STATUS_SUCCESS ) - goto Status_Fail; + goto status_fail; } retval =sd_send_cmd_get_rsp (chip,ALL_SEND_CID ,0 ,SD_RSP_TYPE_R2 ,NULL ,0 );if (retval !=STATUS_SUCCESS ) - goto Status_Fail; + goto status_fail;for (i =0 ; i <3 ; i++) { retval =sd_send_cmd_get_rsp (chip,SEND_RELATIVE_ADDR ,0 ,SD_RSP_TYPE_R6 , rsp,5 );if (retval !=STATUS_SUCCESS ) - goto Status_Fail; + goto status_fail; sd_card->sd_addr = (u32 )rsp[1 ] <<24 ; sd_card->sd_addr += (u32 )rsp[2 ] <<16 ;
@@ -2739,17 +2739,17 @@ static int reset_sd(struct rtsx_chip *chip) retval =sd_check_csd (chip,1 );if (retval !=STATUS_SUCCESS ) - goto Status_Fail; + goto status_fail; retval =sd_select_card (chip,1 );if (retval !=STATUS_SUCCESS ) - goto Status_Fail; + goto status_fail;#ifdef SUPPORT_SD_LOCK SD_UNLOCK_ENTRY: retval =sd_update_lock_status (chip);if (retval !=STATUS_SUCCESS ) - goto Status_Fail; + goto status_fail;if (sd_card->sd_lock_status &SD_LOCKED ) { sd_card->sd_lock_status |= (SD_LOCK_1BIT_MODE |SD_PWD_EXIST );
@@ -2762,23 +2762,23 @@ static int reset_sd(struct rtsx_chip *chip) retval =sd_send_cmd_get_rsp (chip,APP_CMD , sd_card->sd_addr,SD_RSP_TYPE_R1 ,NULL ,0 );if (retval !=STATUS_SUCCESS ) - goto Status_Fail; + goto status_fail; retval =sd_send_cmd_get_rsp (chip,SET_CLR_CARD_DETECT ,0 ,SD_RSP_TYPE_R1 ,NULL ,0 );if (retval !=STATUS_SUCCESS ) - goto Status_Fail; + goto status_fail;if (support_1v8) { retval =sd_send_cmd_get_rsp (chip,APP_CMD , sd_card->sd_addr,SD_RSP_TYPE_R1 ,NULL ,0 );if (retval !=STATUS_SUCCESS ) - goto Status_Fail; + goto status_fail; retval =sd_send_cmd_get_rsp (chip,SET_BUS_WIDTH ,2 ,SD_RSP_TYPE_R1 ,NULL ,0 );if (retval !=STATUS_SUCCESS ) - goto Status_Fail; + goto status_fail; switch_bus_width =SD_BUS_WIDTH_4 ; }else {
@@ -2788,11 +2788,11 @@ static int reset_sd(struct rtsx_chip *chip) retval =sd_send_cmd_get_rsp (chip,SET_BLOCKLEN ,0x200 ,SD_RSP_TYPE_R1 ,NULL ,0 );if (retval !=STATUS_SUCCESS ) - goto Status_Fail; + goto status_fail; retval =sd_set_clock_divider (chip,SD_CLK_DIVIDE_0 );if (retval !=STATUS_SUCCESS ) - goto Status_Fail; + goto status_fail;if (!(sd_card->raw_csd[4 ] &0x40 )) sd_dont_switch = true;
@@ -2815,7 +2815,7 @@ static int reset_sd(struct rtsx_chip *chip) sd_dont_switch = true; try_sdio = false; - goto Switch_Fail; + goto switch_fail; } }else {if (support_1v8) {
@@ -2823,7 +2823,7 @@ static int reset_sd(struct rtsx_chip *chip) sd_dont_switch = true; try_sdio = false; - goto Switch_Fail; + goto switch_fail; } } }
@@ -2832,12 +2832,12 @@ static int reset_sd(struct rtsx_chip *chip) retval =sd_send_cmd_get_rsp (chip,APP_CMD , sd_card->sd_addr,SD_RSP_TYPE_R1 ,NULL ,0 );if (retval !=STATUS_SUCCESS ) - goto Status_Fail; + goto status_fail; retval =sd_send_cmd_get_rsp (chip,SET_BUS_WIDTH ,2 ,SD_RSP_TYPE_R1 ,NULL ,0 );if (retval !=STATUS_SUCCESS ) - goto Status_Fail; + goto status_fail; }#ifdef SUPPORT_SD_LOCK
@@ -2856,7 +2856,7 @@ static int reset_sd(struct rtsx_chip *chip) retval =sd_set_init_para (chip);if (retval !=STATUS_SUCCESS ) - goto Status_Fail; + goto status_fail;if (CHK_SD_DDR50 (sd_card)) retval =sd_ddr_tuning (chip);
@@ -2865,15 +2865,15 @@ static int reset_sd(struct rtsx_chip *chip)if (retval !=STATUS_SUCCESS ) {if (sd20_mode) { - goto Status_Fail; + goto status_fail; }else { retval =sd_init_power (chip);if (retval !=STATUS_SUCCESS ) - goto Status_Fail; + goto status_fail; try_sdio = false; sd20_mode = true; - goto Switch_Fail; + goto switch_fail; } }
@@ -2890,15 +2890,15 @@ static int reset_sd(struct rtsx_chip *chip) retval =sd_read_lba0 (chip);if (retval !=STATUS_SUCCESS ) {if (sd20_mode) { - goto Status_Fail; + goto status_fail; }else { retval =sd_init_power (chip);if (retval !=STATUS_SUCCESS ) - goto Status_Fail; + goto status_fail; try_sdio = false; sd20_mode = true; - goto Switch_Fail; + goto switch_fail; } } }
@@ -2906,7 +2906,7 @@ static int reset_sd(struct rtsx_chip *chip) retval =sd_check_wp_state (chip);if (retval !=STATUS_SUCCESS ) - goto Status_Fail; + goto status_fail; chip->card_bus_width[chip->card2lun[SD_CARD ]] =4 ;
@@ -2929,7 +2929,7 @@ static int reset_sd(struct rtsx_chip *chip)return STATUS_SUCCESS ; -Status_Fail: +status_fail:rtsx_trace (chip);return STATUS_FAIL ; }
@@ -3201,7 +3201,7 @@ static int reset_mmc(struct rtsx_chip *chip) goto MMC_UNLOCK_ENTRY;#endif -Switch_Fail: +switch_fail: retval =sd_prepare_reset (chip);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);
@@ -3330,7 +3330,7 @@ static int reset_mmc(struct rtsx_chip *chip) } sd_card->mmc_dont_switch_bus =1 ;rtsx_trace (chip); - goto Switch_Fail; + goto switch_fail; } }
@@ -3356,7 +3356,7 @@ static int reset_mmc(struct rtsx_chip *chip) switch_ddr = false;rtsx_trace (chip); - goto Switch_Fail; + goto switch_fail; } retval =sd_wait_state_data_ready (chip,0x08 ,1 ,1000 );
@@ -3371,7 +3371,7 @@ static int reset_mmc(struct rtsx_chip *chip) switch_ddr = false;rtsx_trace (chip); - goto Switch_Fail; + goto switch_fail; } } }
@@ -4381,7 +4381,7 @@ int sd_execute_no_data(struct scsi_cmnd *srb, struct rtsx_chip *chip) retval =sd_select_card (chip,0 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); - goto SD_Execute_Cmd_Failed; + goto sd_execute_cmd_failed; } }
@@ -4392,7 +4392,7 @@ int sd_execute_no_data(struct scsi_cmnd *srb, struct rtsx_chip *chip) false);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); - goto SD_Execute_Cmd_Failed; + goto sd_execute_cmd_failed; } }
@@ -4400,14 +4400,14 @@ int sd_execute_no_data(struct scsi_cmnd *srb, struct rtsx_chip *chip) sd_card->rsp, rsp_len, false);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); - goto SD_Execute_Cmd_Failed; + goto sd_execute_cmd_failed; }if (standby) { retval =sd_select_card (chip,1 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); - goto SD_Execute_Cmd_Failed; + goto sd_execute_cmd_failed; } }
@@ -4415,14 +4415,14 @@ int sd_execute_no_data(struct scsi_cmnd *srb, struct rtsx_chip *chip) retval =sd_update_lock_status (chip);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); - goto SD_Execute_Cmd_Failed; + goto sd_execute_cmd_failed; }#endif scsi_set_resid (srb,0 );return TRANSPORT_GOOD ; -SD_Execute_Cmd_Failed: +sd_execute_cmd_failed: sd_card->pre_cmd_err =1 ;set_sense_type (chip, lun,SENSE_TYPE_NO_SENSE );release_sd_card (chip);
@@ -4512,7 +4512,7 @@ int sd_execute_read_data(struct scsi_cmnd *srb, struct rtsx_chip *chip) false);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); - goto SD_Execute_Read_Cmd_Failed; + goto sd_execute_read_cmd_failed; } }
@@ -4520,7 +4520,7 @@ int sd_execute_read_data(struct scsi_cmnd *srb, struct rtsx_chip *chip) retval =sd_select_card (chip,0 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); - goto SD_Execute_Read_Cmd_Failed; + goto sd_execute_read_cmd_failed; } }
@@ -4531,7 +4531,7 @@ int sd_execute_read_data(struct scsi_cmnd *srb, struct rtsx_chip *chip) false);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); - goto SD_Execute_Read_Cmd_Failed; + goto sd_execute_read_cmd_failed; } }
@@ -4563,7 +4563,7 @@ int sd_execute_read_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)kfree (buf);rtsx_clear_sd_error (chip);rtsx_trace (chip); - goto SD_Execute_Read_Cmd_Failed; + goto sd_execute_read_cmd_failed; } min_len =min (data_len,scsi_bufflen (srb));
@@ -4613,25 +4613,25 @@ int sd_execute_read_data(struct scsi_cmnd *srb, struct rtsx_chip *chip) read_err = true;rtsx_clear_sd_error (chip);rtsx_trace (chip); - goto SD_Execute_Read_Cmd_Failed; + goto sd_execute_read_cmd_failed; } }else {rtsx_trace (chip); - goto SD_Execute_Read_Cmd_Failed; + goto sd_execute_read_cmd_failed; } retval =ext_sd_get_rsp (chip, rsp_len, sd_card->rsp, rsp_type);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); - goto SD_Execute_Read_Cmd_Failed; + goto sd_execute_read_cmd_failed; }if (standby) { retval =sd_select_card (chip,1 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); - goto SD_Execute_Read_Cmd_Failed; + goto sd_execute_read_cmd_failed; } }
@@ -4641,7 +4641,7 @@ int sd_execute_read_data(struct scsi_cmnd *srb, struct rtsx_chip *chip) false);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); - goto SD_Execute_Read_Cmd_Failed; + goto sd_execute_read_cmd_failed; } }
@@ -4651,19 +4651,19 @@ int sd_execute_read_data(struct scsi_cmnd *srb, struct rtsx_chip *chip) false);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); - goto SD_Execute_Read_Cmd_Failed; + goto sd_execute_read_cmd_failed; } retval =rtsx_write_register (chip,SD_BYTE_CNT_H ,0xFF ,0x02 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); - goto SD_Execute_Read_Cmd_Failed; + goto sd_execute_read_cmd_failed; } retval =rtsx_write_register (chip,SD_BYTE_CNT_L ,0xFF ,0x00 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); - goto SD_Execute_Read_Cmd_Failed; + goto sd_execute_read_cmd_failed; } }
@@ -4680,13 +4680,13 @@ int sd_execute_read_data(struct scsi_cmnd *srb, struct rtsx_chip *chip) }if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); - goto SD_Execute_Read_Cmd_Failed; + goto sd_execute_read_cmd_failed; }scsi_set_resid (srb,0 );return TRANSPORT_GOOD ; -SD_Execute_Read_Cmd_Failed: +sd_execute_read_cmd_failed: sd_card->pre_cmd_err =1 ;set_sense_type (chip, lun,SENSE_TYPE_NO_SENSE );if (read_err)
@@ -4804,7 +4804,7 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip) false);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); - goto SD_Execute_Write_Cmd_Failed; + goto sd_execute_write_cmd_failed; } }
@@ -4812,7 +4812,7 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip) retval =sd_select_card (chip,0 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); - goto SD_Execute_Write_Cmd_Failed; + goto sd_execute_write_cmd_failed; } }
@@ -4823,7 +4823,7 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip) false);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); - goto SD_Execute_Write_Cmd_Failed; + goto sd_execute_write_cmd_failed; } }
@@ -4831,7 +4831,7 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip) sd_card->rsp, rsp_len, false);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); - goto SD_Execute_Write_Cmd_Failed; + goto sd_execute_write_cmd_failed; }if (data_len <=512 ) {
@@ -4861,7 +4861,7 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (retval !=STATUS_SUCCESS ) {kfree (buf);rtsx_trace (chip); - goto SD_Execute_Write_Cmd_Failed; + goto sd_execute_write_cmd_failed; }rtsx_init_cmd (chip);
@@ -4873,7 +4873,7 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (retval !=STATUS_SUCCESS ) {kfree (buf);rtsx_trace (chip); - goto SD_Execute_Write_Cmd_Failed; + goto sd_execute_write_cmd_failed; } }else {rtsx_init_cmd (chip);
@@ -4885,7 +4885,7 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (retval !=STATUS_SUCCESS ) {kfree (buf);rtsx_trace (chip); - goto SD_Execute_Write_Cmd_Failed; + goto sd_execute_write_cmd_failed; } }
@@ -4938,14 +4938,14 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip) }else {rtsx_trace (chip); - goto SD_Execute_Write_Cmd_Failed; + goto sd_execute_write_cmd_failed; }if (retval <0 ) { write_err = true;rtsx_clear_sd_error (chip);rtsx_trace (chip); - goto SD_Execute_Write_Cmd_Failed; + goto sd_execute_write_cmd_failed; }#ifdef SUPPORT_SD_LOCK
@@ -4973,7 +4973,7 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip) retval =sd_select_card (chip,1 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); - goto SD_Execute_Write_Cmd_Failed; + goto sd_execute_write_cmd_failed; } }
@@ -4983,7 +4983,7 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip) false);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); - goto SD_Execute_Write_Cmd_Failed; + goto sd_execute_write_cmd_failed; } }
@@ -4993,19 +4993,19 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip) false);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); - goto SD_Execute_Write_Cmd_Failed; + goto sd_execute_write_cmd_failed; } retval =rtsx_write_register (chip,SD_BYTE_CNT_H ,0xFF ,0x02 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); - goto SD_Execute_Write_Cmd_Failed; + goto sd_execute_write_cmd_failed; }rtsx_write_register (chip,SD_BYTE_CNT_L ,0xFF ,0x00 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); - goto SD_Execute_Write_Cmd_Failed; + goto sd_execute_write_cmd_failed; } }
@@ -5022,7 +5022,7 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip) }if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); - goto SD_Execute_Write_Cmd_Failed; + goto sd_execute_write_cmd_failed; }#ifdef SUPPORT_SD_LOCK
@@ -5050,7 +5050,7 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (retval !=STATUS_SUCCESS ) { sd_card->sd_lock_status &= ~(SD_UNLOCK_POW_ON |SD_SDR_RST );rtsx_trace (chip); - goto SD_Execute_Write_Cmd_Failed; + goto sd_execute_write_cmd_failed; } }
@@ -5071,7 +5071,7 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)scsi_set_resid (srb,0 );return TRANSPORT_GOOD ; -SD_Execute_Write_Cmd_Failed: +sd_execute_write_cmd_failed: sd_card->pre_cmd_err =1 ;set_sense_type (chip, lun,SENSE_TYPE_NO_SENSE );if (write_err)
Signature · 1 line
2.1.4
PATCH 8/45 staging: rts5208: sd.c: Fix logical continuations
In reply to Wayne PorterCheckpatch detected && at the beginning of new lines
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/sd.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)
drivers/staging/rts5208/sd.c +15 -15
@@ -1404,22 +1404,22 @@ static int sd_switch_function(struct rtsx_chip *chip, u8 bus_width)for (i =0 ; i <4 ; i++) {switch ((u8)(chip->sd_speed_prior >> (i*8 ))) {case SDR104_SUPPORT : -if ((sd_card->func_group1_mask &SDR104_SUPPORT_MASK ) - && chip->sdr104_en) { +if ((sd_card->func_group1_mask &SDR104_SUPPORT_MASK ) && + chip->sdr104_en) { func_to_switch =SDR104_SUPPORT ; }break ;case DDR50_SUPPORT : -if ((sd_card->func_group1_mask &DDR50_SUPPORT_MASK ) - && chip->ddr50_en) { +if ((sd_card->func_group1_mask &DDR50_SUPPORT_MASK ) && + chip->ddr50_en) { func_to_switch =DDR50_SUPPORT ; }break ;case SDR50_SUPPORT : -if ((sd_card->func_group1_mask &SDR50_SUPPORT_MASK ) - && chip->sdr50_en) { +if ((sd_card->func_group1_mask &SDR50_SUPPORT_MASK ) && + chip->sdr50_en) { func_to_switch =SDR50_SUPPORT ; }break ;
@@ -3746,11 +3746,11 @@ int sd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector, ((sd_card->pre_dir != srb->sc_data_direction) || ((sd_card->pre_sec_addr + sd_card->pre_sec_cnt) != start_sector))) { - if ((sd_card->pre_sec_cnt < 0x80) - && (sd_card->pre_dir ==DMA_FROM_DEVICE ) - && !CHK_SD30_SPEED (sd_card) - && !CHK_SD_HS (sd_card) - && !CHK_MMC_HS(sd_card)) { + if ((sd_card->pre_sec_cnt < 0x80) && + (sd_card->pre_dir ==DMA_FROM_DEVICE ) && + !CHK_SD30_SPEED (sd_card) && + !CHK_SD_HS (sd_card) && + !CHK_MMC_HS(sd_card)) {sd_send_cmd_get_rsp (chip,SEND_STATUS , sd_card->sd_addr,SD_RSP_TYPE_R1 ,NULL ,0 ); }
@@ -3773,10 +3773,10 @@ int sd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector, goto RW_FAIL; } -if ((sd_card->pre_sec_cnt <0x80 ) - && !CHK_SD30_SPEED (sd_card) - && !CHK_SD_HS (sd_card) - && !CHK_MMC_HS (sd_card)) { +if ((sd_card->pre_sec_cnt <0x80 ) && + !CHK_SD30_SPEED (sd_card) && + !CHK_SD_HS (sd_card) && + !CHK_MMC_HS (sd_card)) {sd_send_cmd_get_rsp (chip,SEND_STATUS , sd_card->sd_addr,SD_RSP_TYPE_R1 ,NULL ,0 ); }
Signature · 1 line
2.1.4
PATCH 9/45 staging: rts5208: sd.c: Spacing cleanup
In reply to Wayne PorterAdd/remove spaces to make things more readable
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/sd.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/staging/rts5208/sd.c +3 -4
@@ -1402,7 +1402,7 @@ static int sd_switch_function(struct rtsx_chip *chip, u8 bus_width)/* Function Group 1: Access Mode */ for (i =0 ; i <4 ; i++) { -switch ((u8)(chip->sd_speed_prior >> (i*8 ))) { +switch ((u8)(chip->sd_speed_prior >> (i *8 ))) {case SDR104_SUPPORT :if ((sd_card->func_group1_mask &SDR104_SUPPORT_MASK ) && chip->sdr104_en) {
@@ -1436,7 +1436,6 @@ static int sd_switch_function(struct rtsx_chip *chip, u8 bus_width)if (func_to_switch)break ; - }dev_dbg (rtsx_dev (chip),"SD_FUNC_GROUP_1: func_to_switch = 0x%02x" , func_to_switch);
@@ -1502,7 +1501,7 @@ static int sd_switch_function(struct rtsx_chip *chip, u8 bus_width) func_to_switch =0xFF ;for (i =0 ; i <4 ; i++) { -switch ((u8)(chip->sd_current_prior >> (i*8 ))) { +switch ((u8)(chip->sd_current_prior >> (i *8 ))) {case CURRENT_LIMIT_800 :if (sd_card->func_group4_mask &CURRENT_LIMIT_800_MASK ) func_to_switch =CURRENT_LIMIT_800 ;
@@ -3804,7 +3803,7 @@ int sd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector, 0x03, SD_BUS_WIDTH_1);if (sd_card->seq_mode) { - cfg2 =SD_NO_CALCULATE_CRC7 |SD_CHECK_CRC16 | + cfg2 =SD_NO_CALCULATE_CRC7 |SD_CHECK_CRC16 |SD_NO_WAIT_BUSY_END |SD_NO_CHECK_CRC7 |SD_RSP_LEN_0 ;rtsx_add_cmd (chip,WRITE_REG_CMD ,REG_SD_CFG2 ,0xFF , cfg2);
Signature · 1 line
2.1.4
PATCH 10/45 staging: rts5208: Alignment fixes
In reply to Wayne PorterCleaning up checkpatch issues
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/rtsx_transport.h | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-)
drivers/staging/rts5208/rtsx_transport.h +17 -13
@@ -30,18 +30,21 @@#define WAIT_TIME 2000unsigned int rtsx_stor_access_xfer_buf (unsigned char *buffer, -unsigned int buflen,struct scsi_cmnd *srb,unsigned int *index, -unsigned int *offset,enum xfer_buf_dir dir); -void rtsx_stor_set_xfer_buf (unsigned char *buffer, -unsigned int buflen,struct scsi_cmnd *srb); -void rtsx_stor_get_xfer_buf (unsigned char *buffer, -unsigned int buflen,struct scsi_cmnd *srb); +unsigned int buflen, +struct scsi_cmnd *srb, +unsigned int *index, +unsigned int *offset, +enum xfer_buf_dir dir); +void rtsx_stor_set_xfer_buf (unsigned char *buffer,unsigned int buflen, +struct scsi_cmnd *srb); +void rtsx_stor_get_xfer_buf (unsigned char *buffer,unsigned int buflen, +struct scsi_cmnd *srb);void rtsx_invoke_transport (struct scsi_cmnd *srb,struct rtsx_chip *chip);#define rtsx_init_cmd (chip) ((chip)->ci = 0) -void rtsx_add_cmd (struct rtsx_chip *chip, -u8 cmd_type,u16 reg_addr,u8 mask,u8 data); +void rtsx_add_cmd (struct rtsx_chip *chip,u8 cmd_type,u16 reg_addr,u8 mask, +u8 data);void rtsx_send_cmd_no_wait (struct rtsx_chip *chip);int rtsx_send_cmd (struct rtsx_chip *chip,u8 card,int timeout);
@@ -55,11 +58,12 @@ static inline u8 *rtsx_get_cmd_data(struct rtsx_chip *chip) }int rtsx_transfer_data (struct rtsx_chip *chip,u8 card,void *buf,size_t len, -int use_sg,enum dma_data_direction dma_dir,int timeout); +int use_sg,enum dma_data_direction dma_dir, +int timeout); -int rtsx_transfer_data_partial (struct rtsx_chip *chip,u8 card, -void *buf,size_t len, -int use_sg,unsigned int *index,unsigned int *offset, -enum dma_data_direction dma_dir,int timeout); +int rtsx_transfer_data_partial (struct rtsx_chip *chip,u8 card,void *buf, +size_t len,int use_sg,unsigned int *index, +unsigned int *offset, +enum dma_data_direction dma_dir,int timeout);#endif /* __REALTEK_RTSX_TRANSPORT_H */
Signature · 1 line
2.1.4
PATCH 11/45 staging: rts5208: Unnecessary parentheses cleanup
In reply to Wayne PorterRemove parentheses found by checkpatch
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/rtsx_sys.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rts5208/rtsx_sys.h +2 -2
@@ -32,9 +32,9 @@ static inline void rtsx_exclusive_enter_ss(struct rtsx_chip *chip) {struct rtsx_dev *dev = chip->rtsx; -spin_lock (&(dev->reg_lock)); +spin_lock (&dev->reg_lock);rtsx_enter_ss (chip); -spin_unlock (&(dev->reg_lock)); +spin_unlock (&dev->reg_lock); }static inline void rtsx_reset_detected_cards (struct rtsx_chip *chip,int flag)
Signature · 1 line
2.1.4
PATCH 12/45 staging: rts5208: Alignment fix
In reply to Wayne PorterFix issue found by checkpatch
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/rtsx_scsi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rts5208/rtsx_scsi.h +2 -2
@@ -136,8 +136,8 @@void scsi_show_command (struct rtsx_chip *chip);void set_sense_type (struct rtsx_chip *chip,unsigned int lun,int sense_type);void set_sense_data (struct rtsx_chip *chip,unsigned int lun,u8 err_code, -u8 sense_key,u32 info,u8 asc,u8 ascq, -u8 sns_key_info0,u16 sns_key_info1); +u8 sense_key,u32 info,u8 asc,u8 ascq, +u8 sns_key_info0,u16 sns_key_info1);int rtsx_scsi_handler (struct scsi_cmnd *srb,struct rtsx_chip *chip);#endif /* __REALTEK_RTSX_SCSI_H */
Signature · 1 line
2.1.4
PATCH 13/45 staging: rts5208: Fix typo in function name
In reply to Wayne PorterSearched the entire kernel for any references to this function and it appears safe to fix the typo
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/rtsx_scsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rts5208/rtsx_scsi.c +2 -2
@@ -3100,7 +3100,7 @@ static int ms_sp_cmnd(struct scsi_cmnd *srb, struct rtsx_chip *chip) }#ifdef SUPPORT_CPRM -static int sd_extention_cmnd (struct scsi_cmnd *srb,struct rtsx_chip *chip) +static int sd_extension_cmnd (struct scsi_cmnd *srb,struct rtsx_chip *chip) {unsigned int lun =SCSI_LUN (srb);int result;
@@ -3510,7 +3510,7 @@ int rtsx_scsi_handler(struct scsi_cmnd *srb, struct rtsx_chip *chip)case SD_EXECUTE_WRITE :case SD_GET_RSP :case SD_HW_RST : - result =sd_extention_cmnd (srb, chip); + result =sd_extension_cmnd (srb, chip);break ;#endif
Signature · 1 line
2.1.4
PATCH 14/45 staging: rts5208: Alignment fixes
In reply to Wayne PorterAlign to match open parenthesis, found by checkpatch
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/rtsx_scsi.c | 201 ++++++++++++++++++------------------ 1 file changed, 101 insertions(+), 100 deletions(-)
drivers/staging/rts5208/rtsx_scsi.c +101 -100
@@ -354,7 +354,7 @@ void set_sense_type(struct rtsx_chip *chip, unsigned int lun, int sense_type)case SENSE_TYPE_MEDIA_INVALID_CMD_FIELD :set_sense_data (chip, lun,CUR_ERR ,ILGAL_REQ ,0 , -ASC_INVLD_CDB ,ASCQ_INVLD_CDB ,CDB_ILLEGAL ,1 ); +ASC_INVLD_CDB ,ASCQ_INVLD_CDB ,CDB_ILLEGAL ,1 );break ;case SENSE_TYPE_FORMAT_IN_PROGRESS :
@@ -397,7 +397,7 @@ void set_sense_type(struct rtsx_chip *chip, unsigned int lun, int sense_type) }void set_sense_data (struct rtsx_chip *chip,unsigned int lun,u8 err_code, -u8 sense_key,u32 info,u8 asc,u8 ascq,u8 sns_key_info0, +u8 sense_key,u32 info,u8 asc,u8 ascq,u8 sns_key_info0,u16 sns_key_info1) {struct sense_data_t *sense = &(chip->sense_buffer[lun]);
@@ -444,7 +444,7 @@ static int test_unit_ready(struct scsi_cmnd *srb, struct rtsx_chip *chip)return TRANSPORT_FAILED ; }else if (sd_card->sd_lock_status &SD_LOCKED ) {set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_READ_FORBIDDEN ); +SENSE_TYPE_MEDIA_READ_FORBIDDEN );return TRANSPORT_FAILED ; } }
@@ -514,7 +514,7 @@ static int inquiry(struct scsi_cmnd *srb, struct rtsx_chip *chip)#ifdef SUPPORT_MAGIC_GATE if ((chip->mspro_formatter_enable) && - (chip->lun2card[lun] &MS_CARD )) + (chip->lun2card[lun] &MS_CARD )) #else if (chip->mspro_formatter_enable)#endif
@@ -603,7 +603,7 @@ static int allow_medium_removal(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (prevent) {set_sense_type (chip,SCSI_LUN (srb), -SENSE_TYPE_MEDIA_INVALID_CMD_FIELD ); +SENSE_TYPE_MEDIA_INVALID_CMD_FIELD );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -621,7 +621,7 @@ static int request_sense(struct scsi_cmnd *srb, struct rtsx_chip *chip) sense = &(chip->sense_buffer[lun]);if ((get_lun_card (chip, lun) ==MS_CARD ) && - ms_card->pro_under_formatting) { + ms_card->pro_under_formatting) {if (ms_card->format_status ==FORMAT_SUCCESS ) {set_sense_type (chip, lun,SENSE_TYPE_NO_SENSE ); ms_card->pro_under_formatting =0 ;
@@ -629,7 +629,7 @@ static int request_sense(struct scsi_cmnd *srb, struct rtsx_chip *chip) }else if (ms_card->format_status ==FORMAT_IN_PROGRESS ) {/* Logical Unit Not Ready Format in Progress */ set_sense_data (chip, lun,CUR_ERR ,0x02 ,0 ,0x04 ,0x04 , -0 , (u16)(ms_card->progress)); +0 , (u16)(ms_card->progress)); }else {/* Format Command Failed */ set_sense_type (chip, lun,SENSE_TYPE_FORMAT_CMD_FAILED );
@@ -659,7 +659,7 @@ static int request_sense(struct scsi_cmnd *srb, struct rtsx_chip *chip) }static void ms_mode_sense (struct rtsx_chip *chip,u8 cmd, -int lun,u8 *buf,int buf_len) +int lun,u8 *buf,int buf_len) {struct ms_info *ms_card = &(chip->ms_card);int sys_info_offset;
@@ -797,7 +797,7 @@ static int mode_sense(struct scsi_cmnd *srb, struct rtsx_chip *chip) pageCode = srb->cmnd[2 ] &0x3f ;if ((pageCode ==0x3F ) || (pageCode ==0x1C ) || - (pageCode ==0x00 ) || + (pageCode ==0x00 ) || (pro_formatter_flag && (pageCode ==0x20 ))) {if (srb->cmnd[0 ] ==MODE_SENSE ) {if ((pageCode ==0x3F ) || (pageCode ==0x20 )) {
@@ -896,7 +896,7 @@ static int read_write(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (sd_card->sd_lock_status &SD_LOCKED ) {dev_dbg (rtsx_dev (chip),"SD card locked!\n" );set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_READ_FORBIDDEN ); +SENSE_TYPE_MEDIA_READ_FORBIDDEN );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -932,7 +932,7 @@ static int read_write(struct scsi_cmnd *srb, struct rtsx_chip *chip)* need to judge start_sec at first */ if ((start_sec >get_card_size (chip, lun)) || - ((start_sec + sec_cnt) >get_card_size (chip, lun))) { + ((start_sec + sec_cnt) >get_card_size (chip, lun))) {set_sense_type (chip, lun,SENSE_TYPE_MEDIA_LBA_OVER_RANGE );rtsx_trace (chip);return TRANSPORT_FAILED ;
@@ -947,7 +947,7 @@ static int read_write(struct scsi_cmnd *srb, struct rtsx_chip *chip)dev_dbg (rtsx_dev (chip),"read/write fail three times in succession\n" );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 );
@@ -959,7 +959,7 @@ static int read_write(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (check_card_wp (chip, lun)) {dev_dbg (rtsx_dev (chip),"Write protected card!\n" );set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_WRITE_PROTECT ); +SENSE_TYPE_MEDIA_WRITE_PROTECT );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -977,7 +977,7 @@ static int read_write(struct scsi_cmnd *srb, struct rtsx_chip *chip) SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR); elseset_sense_type (chip ,lun , -SENSE_TYPE_MEDIA_WRITE_ERR ); +SENSE_TYPE_MEDIA_WRITE_ERR ); } retval =TRANSPORT_FAILED ;rtsx_trace (chip);
@@ -1025,8 +1025,8 @@ static int read_format_capacity(struct scsi_cmnd *srb, struct rtsx_chip *chip)/* Capacity List Length */ if ((buf_len >12 ) && chip->mspro_formatter_enable && - (chip->lun2card[lun] &MS_CARD ) && - (!card || (card ==MS_CARD ))) { + (chip->lun2card[lun] &MS_CARD ) && + (!card || (card ==MS_CARD ))) { buf[i++] =0x10 ; desc_cnt =2 ; }else {
@@ -1143,7 +1143,7 @@ static int read_eeprom(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (retval !=STATUS_SUCCESS ) {vfree (buf);set_sense_type (chip,SCSI_LUN (srb), -SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR ); +SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -1153,7 +1153,7 @@ static int read_eeprom(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (retval !=STATUS_SUCCESS ) {vfree (buf);set_sense_type (chip,SCSI_LUN (srb), -SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR ); +SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -1195,7 +1195,7 @@ static int write_eeprom(struct scsi_cmnd *srb, struct rtsx_chip *chip) retval =spi_erase_eeprom_chip (chip);if (retval !=STATUS_SUCCESS ) {set_sense_type (chip,SCSI_LUN (srb), -SENSE_TYPE_MEDIA_WRITE_ERR ); +SENSE_TYPE_MEDIA_WRITE_ERR );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -1216,7 +1216,7 @@ static int write_eeprom(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (retval !=STATUS_SUCCESS ) {vfree (buf);set_sense_type (chip,SCSI_LUN (srb), -SENSE_TYPE_MEDIA_WRITE_ERR ); +SENSE_TYPE_MEDIA_WRITE_ERR );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -1247,7 +1247,7 @@ static int read_mem(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (addr <0xFC00 ) {set_sense_type (chip,SCSI_LUN (srb), -SENSE_TYPE_MEDIA_INVALID_CMD_FIELD ); +SENSE_TYPE_MEDIA_INVALID_CMD_FIELD );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -1271,7 +1271,7 @@ static int read_mem(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (retval !=STATUS_SUCCESS ) {vfree (buf);set_sense_type (chip,SCSI_LUN (srb), -SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR ); +SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -1305,7 +1305,7 @@ static int write_mem(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (addr <0xFC00 ) {set_sense_type (chip,SCSI_LUN (srb), -SENSE_TYPE_MEDIA_INVALID_CMD_FIELD ); +SENSE_TYPE_MEDIA_INVALID_CMD_FIELD );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -1333,7 +1333,7 @@ static int write_mem(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (retval !=STATUS_SUCCESS ) {vfree (buf);set_sense_type (chip,SCSI_LUN (srb), -SENSE_TYPE_MEDIA_WRITE_ERR ); +SENSE_TYPE_MEDIA_WRITE_ERR );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -1399,7 +1399,7 @@ static int trace_msg_cmd(struct scsi_cmnd *srb, struct rtsx_chip *chip)if ((scsi_bufflen (srb) < buf_len) || !scsi_sglist (srb)) {set_sense_type (chip,SCSI_LUN (srb), -SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR ); +SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -1541,7 +1541,7 @@ static int set_variable(struct scsi_cmnd *srb, struct rtsx_chip *chip)default :set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_INVALID_CMD_FIELD ); +SENSE_TYPE_MEDIA_INVALID_CMD_FIELD );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -1556,7 +1556,7 @@ static int set_variable(struct scsi_cmnd *srb, struct rtsx_chip *chip)rtsx_disable_aspm (chip);if (chip->ss_en && - (rtsx_get_stat (chip) ==RTSX_STAT_SS )) { + (rtsx_get_stat (chip) ==RTSX_STAT_SS )) {rtsx_exit_ss (chip);wait_timeout (100 ); }
@@ -1565,7 +1565,7 @@ static int set_variable(struct scsi_cmnd *srb, struct rtsx_chip *chip) retval =rtsx_force_power_on (chip,SSC_PDCTL );if (retval !=STATUS_SUCCESS ) {set_sense_type (chip,SCSI_LUN (srb), -SENSE_TYPE_MEDIA_WRITE_ERR ); +SENSE_TYPE_MEDIA_WRITE_ERR );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -1606,7 +1606,7 @@ static int get_variable(struct scsi_cmnd *srb, struct rtsx_chip *chip)default :set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_INVALID_CMD_FIELD ); +SENSE_TYPE_MEDIA_INVALID_CMD_FIELD );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -1648,14 +1648,15 @@ static int dma_access_ring_buffer(struct scsi_cmnd *srb, struct rtsx_chip *chip)dev_dbg (rtsx_dev (chip),"Write to device\n" ); retval =rtsx_transfer_data (chip,0 ,scsi_sglist (srb), len, -scsi_sg_count (srb), srb->sc_data_direction,1000 ); +scsi_sg_count (srb), srb->sc_data_direction, +1000 );if (retval <0 ) {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 TRANSPORT_FAILED ;
@@ -1699,8 +1700,8 @@ static int get_dev_status(struct scsi_cmnd *srb, struct rtsx_chip *chip)#ifdef SUPPORT_OCP status[8 ] =0 ; -if (CHECK_LUN_MODE (chip, -SD_MS_2LUN ) && (chip->lun2card[lun] ==MS_CARD )) { +if (CHECK_LUN_MODE (chip,SD_MS_2LUN ) && + (chip->lun2card[lun] ==MS_CARD )) { oc_now_mask =MS_OC_NOW ; oc_ever_mask =MS_OC_EVER ; }else {
@@ -1804,7 +1805,7 @@ static int set_chip_mode(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (!CHECK_PID (chip,0x5208 )) {set_sense_type (chip,SCSI_LUN (srb), -SENSE_TYPE_MEDIA_INVALID_CMD_FIELD ); +SENSE_TYPE_MEDIA_INVALID_CMD_FIELD );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -1884,7 +1885,7 @@ static int rw_mem_cmd_buf(struct scsi_cmnd *srb, struct rtsx_chip *chip) cmd_type = srb->cmnd[4 ];if (cmd_type >2 ) {set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_INVALID_CMD_FIELD ); +SENSE_TYPE_MEDIA_INVALID_CMD_FIELD );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -1903,7 +1904,7 @@ static int rw_mem_cmd_buf(struct scsi_cmnd *srb, struct rtsx_chip *chip) value = *(rtsx_get_cmd_data (chip) + idx);if (scsi_bufflen (srb) <1 ) {set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_INVALID_CMD_FIELD ); +SENSE_TYPE_MEDIA_INVALID_CMD_FIELD );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -1971,7 +1972,7 @@ static int read_phy_register(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (retval !=STATUS_SUCCESS ) {vfree (buf);set_sense_type (chip,SCSI_LUN (srb), -SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR ); +SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -2039,7 +2040,7 @@ static int write_phy_register(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (retval !=STATUS_SUCCESS ) {vfree (buf);set_sense_type (chip,SCSI_LUN (srb), -SENSE_TYPE_MEDIA_WRITE_ERR ); +SENSE_TYPE_MEDIA_WRITE_ERR );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -2050,7 +2051,7 @@ static int write_phy_register(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (retval !=STATUS_SUCCESS ) {vfree (buf);set_sense_type (chip,SCSI_LUN (srb), -SENSE_TYPE_MEDIA_WRITE_ERR ); +SENSE_TYPE_MEDIA_WRITE_ERR );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -2090,7 +2091,7 @@ static int erase_eeprom2(struct scsi_cmnd *srb, struct rtsx_chip *chip) retval =spi_erase_eeprom_chip (chip);if (retval !=STATUS_SUCCESS ) {set_sense_type (chip,SCSI_LUN (srb), -SENSE_TYPE_MEDIA_WRITE_ERR ); +SENSE_TYPE_MEDIA_WRITE_ERR );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -2098,13 +2099,13 @@ static int erase_eeprom2(struct scsi_cmnd *srb, struct rtsx_chip *chip) retval =spi_erase_eeprom_byte (chip, addr);if (retval !=STATUS_SUCCESS ) {set_sense_type (chip,SCSI_LUN (srb), -SENSE_TYPE_MEDIA_WRITE_ERR ); +SENSE_TYPE_MEDIA_WRITE_ERR );rtsx_trace (chip);return TRANSPORT_FAILED ; } }else {set_sense_type (chip,SCSI_LUN (srb), -SENSE_TYPE_MEDIA_INVALID_CMD_FIELD ); +SENSE_TYPE_MEDIA_INVALID_CMD_FIELD );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -2139,7 +2140,7 @@ static int read_eeprom2(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (retval !=STATUS_SUCCESS ) {vfree (buf);set_sense_type (chip,SCSI_LUN (srb), -SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR ); +SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -2149,7 +2150,7 @@ static int read_eeprom2(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (retval !=STATUS_SUCCESS ) {vfree (buf);set_sense_type (chip,SCSI_LUN (srb), -SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR ); +SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -2204,7 +2205,7 @@ static int write_eeprom2(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (retval !=STATUS_SUCCESS ) {vfree (buf);set_sense_type (chip,SCSI_LUN (srb), -SENSE_TYPE_MEDIA_WRITE_ERR ); +SENSE_TYPE_MEDIA_WRITE_ERR );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -2242,7 +2243,7 @@ static int read_efuse(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (retval !=STATUS_SUCCESS ) {vfree (buf);set_sense_type (chip,SCSI_LUN (srb), -SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR ); +SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -2252,7 +2253,7 @@ static int read_efuse(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (retval !=STATUS_SUCCESS ) {vfree (buf);set_sense_type (chip,SCSI_LUN (srb), -SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR ); +SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -2311,7 +2312,7 @@ static int write_efuse(struct scsi_cmnd *srb, struct rtsx_chip *chip) } retval =rtsx_write_register (chip,PWR_GATE_CTRL , -LDO3318_PWR_MASK ,LDO_OFF ); +LDO3318_PWR_MASK ,LDO_OFF );if (retval !=STATUS_SUCCESS ) {vfree (buf);rtsx_trace (chip);
@@ -2321,7 +2322,7 @@ static int write_efuse(struct scsi_cmnd *srb, struct rtsx_chip *chip)wait_timeout (600 ); retval =rtsx_write_phy_register (chip,0x08 , -0x4C00 | chip->phy_voltage); +0x4C00 | chip->phy_voltage);if (retval !=STATUS_SUCCESS ) {vfree (buf);rtsx_trace (chip);
@@ -2329,7 +2330,7 @@ static int write_efuse(struct scsi_cmnd *srb, struct rtsx_chip *chip) } retval =rtsx_write_register (chip,PWR_GATE_CTRL , -LDO3318_PWR_MASK ,LDO_ON ); +LDO3318_PWR_MASK ,LDO_ON );if (retval !=STATUS_SUCCESS ) {vfree (buf);rtsx_trace (chip);
@@ -2352,7 +2353,7 @@ static int write_efuse(struct scsi_cmnd *srb, struct rtsx_chip *chip) retval =rtsx_write_efuse (chip, addr + i, buf[i]);if (retval !=STATUS_SUCCESS ) {set_sense_type (chip,SCSI_LUN (srb), -SENSE_TYPE_MEDIA_WRITE_ERR ); +SENSE_TYPE_MEDIA_WRITE_ERR ); result =TRANSPORT_FAILED ;rtsx_trace (chip); goto Exit;
@@ -2370,7 +2371,7 @@ static int write_efuse(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (chip->asic_code) { retval =rtsx_write_register (chip,PWR_GATE_CTRL , -LDO3318_PWR_MASK ,LDO_OFF ); +LDO3318_PWR_MASK ,LDO_OFF );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return TRANSPORT_ERROR ;
@@ -2385,7 +2386,7 @@ static int write_efuse(struct scsi_cmnd *srb, struct rtsx_chip *chip) } retval =rtsx_write_register (chip,PWR_GATE_CTRL , -LDO3318_PWR_MASK ,LDO_ON ); +LDO3318_PWR_MASK ,LDO_ON );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return TRANSPORT_ERROR ;
@@ -2425,7 +2426,7 @@ static int read_cfg_byte(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (func > func_max) {set_sense_type (chip,SCSI_LUN (srb), -SENSE_TYPE_MEDIA_INVALID_CMD_FIELD ); +SENSE_TYPE_MEDIA_INVALID_CMD_FIELD );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -2439,7 +2440,7 @@ static int read_cfg_byte(struct scsi_cmnd *srb, struct rtsx_chip *chip) retval =rtsx_read_cfg_seq (chip, func, addr, buf, len);if (retval !=STATUS_SUCCESS ) {set_sense_type (chip,SCSI_LUN (srb), -SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR ); +SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR );vfree (buf);rtsx_trace (chip);return TRANSPORT_FAILED ;
@@ -2484,7 +2485,7 @@ static int write_cfg_byte(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (func > func_max) {set_sense_type (chip,SCSI_LUN (srb), -SENSE_TYPE_MEDIA_INVALID_CMD_FIELD ); +SENSE_TYPE_MEDIA_INVALID_CMD_FIELD );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -2593,7 +2594,7 @@ static int app_cmd(struct scsi_cmnd *srb, struct rtsx_chip *chip)default :set_sense_type (chip,SCSI_LUN (srb), -SENSE_TYPE_MEDIA_INVALID_CMD_FIELD ); +SENSE_TYPE_MEDIA_INVALID_CMD_FIELD );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -2881,7 +2882,7 @@ static int vendor_cmnd(struct scsi_cmnd *srb, struct rtsx_chip *chip)default :set_sense_type (chip,SCSI_LUN (srb), -SENSE_TYPE_MEDIA_INVALID_CMD_FIELD ); +SENSE_TYPE_MEDIA_INVALID_CMD_FIELD );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -2927,7 +2928,7 @@ static int ms_format_cmnd(struct scsi_cmnd *srb, struct rtsx_chip *chip) }if ((srb->cmnd[3 ] !=0x4D ) || (srb->cmnd[4 ] !=0x47 ) || - (srb->cmnd[5 ] !=0x66 ) || (srb->cmnd[6 ] !=0x6D ) || + (srb->cmnd[5 ] !=0x66 ) || (srb->cmnd[6 ] !=0x6D ) || (srb->cmnd[7 ] !=0x74 )) {set_sense_type (chip, lun,SENSE_TYPE_MEDIA_INVALID_CMD_FIELD );rtsx_trace (chip);
@@ -2941,7 +2942,7 @@ static int ms_format_cmnd(struct scsi_cmnd *srb, struct rtsx_chip *chip)wait_timeout (100 );if (!check_card_ready (chip, lun) || - (get_card_size (chip, lun) ==0 )) { + (get_card_size (chip, lun) ==0 )) {set_sense_type (chip, lun,SENSE_TYPE_MEDIA_NOT_PRESENT );rtsx_trace (chip);return TRANSPORT_FAILED ;
@@ -3005,8 +3006,8 @@ static int get_ms_information(struct scsi_cmnd *srb, struct rtsx_chip *chip) }if ((srb->cmnd[2 ] !=0xB0 ) || (srb->cmnd[4 ] !=0x4D ) || - (srb->cmnd[5 ] !=0x53 ) || (srb->cmnd[6 ] !=0x49 ) || - (srb->cmnd[7 ] !=0x44 )) { + (srb->cmnd[5 ] !=0x53 ) || (srb->cmnd[6 ] !=0x49 ) || + (srb->cmnd[7 ] !=0x44 )) {set_sense_type (chip, lun,SENSE_TYPE_MEDIA_INVALID_CMD_FIELD );rtsx_trace (chip);return TRANSPORT_FAILED ;
@@ -3014,8 +3015,8 @@ static int get_ms_information(struct scsi_cmnd *srb, struct rtsx_chip *chip) dev_info_id = srb->cmnd[3 ];if ((CHK_MSXC (ms_card) && (dev_info_id ==0x10 )) || - (!CHK_MSXC (ms_card) && (dev_info_id ==0x13 )) || - !CHK_MSPRO (ms_card)) { + (!CHK_MSXC (ms_card) && (dev_info_id ==0x13 )) || + !CHK_MSPRO (ms_card)) {set_sense_type (chip, lun,SENSE_TYPE_MEDIA_INVALID_CMD_FIELD );rtsx_trace (chip);return TRANSPORT_FAILED ;
@@ -3208,8 +3209,8 @@ static int mg_report_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)switch (key_format) {case KF_GET_LOC_EKB :if ((scsi_bufflen (srb) ==0x41C ) && - (srb->cmnd[8 ] ==0x04 ) && - (srb->cmnd[9 ] ==0x1C )) { + (srb->cmnd[8 ] ==0x04 ) && + (srb->cmnd[9 ] ==0x1C )) { retval =mg_get_local_EKB (srb, chip);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);
@@ -3218,7 +3219,7 @@ static int mg_report_key(struct scsi_cmnd *srb, struct rtsx_chip *chip) }else {set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_INVALID_CMD_FIELD ); +SENSE_TYPE_MEDIA_INVALID_CMD_FIELD );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -3226,8 +3227,8 @@ static int mg_report_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)case KF_RSP_CHG :if ((scsi_bufflen (srb) ==0x24 ) && - (srb->cmnd[8 ] ==0x00 ) && - (srb->cmnd[9 ] ==0x24 )) { + (srb->cmnd[8 ] ==0x00 ) && + (srb->cmnd[9 ] ==0x24 )) { retval =mg_get_rsp_chg (srb, chip);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);
@@ -3236,7 +3237,7 @@ static int mg_report_key(struct scsi_cmnd *srb, struct rtsx_chip *chip) }else {set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_INVALID_CMD_FIELD ); +SENSE_TYPE_MEDIA_INVALID_CMD_FIELD );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -3245,12 +3246,12 @@ static int mg_report_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)case KF_GET_ICV : ms_card->mg_entry_num = srb->cmnd[5 ];if ((scsi_bufflen (srb) ==0x404 ) && - (srb->cmnd[8 ] ==0x04 ) && - (srb->cmnd[9 ] ==0x04 ) && - (srb->cmnd[2 ] ==0x00 ) && - (srb->cmnd[3 ] ==0x00 ) && - (srb->cmnd[4 ] ==0x00 ) && - (srb->cmnd[5 ] <32 )) { + (srb->cmnd[8 ] ==0x04 ) && + (srb->cmnd[9 ] ==0x04 ) && + (srb->cmnd[2 ] ==0x00 ) && + (srb->cmnd[3 ] ==0x00 ) && + (srb->cmnd[4 ] ==0x00 ) && + (srb->cmnd[5 ] <32 )) { retval =mg_get_ICV (srb, chip);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);
@@ -3259,7 +3260,7 @@ static int mg_report_key(struct scsi_cmnd *srb, struct rtsx_chip *chip) }else {set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_INVALID_CMD_FIELD ); +SENSE_TYPE_MEDIA_INVALID_CMD_FIELD );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -3326,8 +3327,8 @@ static int mg_send_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)switch (key_format) {case KF_SET_LEAF_ID :if ((scsi_bufflen (srb) ==0x0C ) && - (srb->cmnd[8 ] ==0x00 ) && - (srb->cmnd[9 ] ==0x0C )) { + (srb->cmnd[8 ] ==0x00 ) && + (srb->cmnd[9 ] ==0x0C )) { retval =mg_set_leaf_id (srb, chip);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);
@@ -3336,7 +3337,7 @@ static int mg_send_key(struct scsi_cmnd *srb, struct rtsx_chip *chip) }else {set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_INVALID_CMD_FIELD ); +SENSE_TYPE_MEDIA_INVALID_CMD_FIELD );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -3344,8 +3345,8 @@ static int mg_send_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)case KF_CHG_HOST :if ((scsi_bufflen (srb) ==0x0C ) && - (srb->cmnd[8 ] ==0x00 ) && - (srb->cmnd[9 ] ==0x0C )) { + (srb->cmnd[8 ] ==0x00 ) && + (srb->cmnd[9 ] ==0x0C )) { retval =mg_chg (srb, chip);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);
@@ -3354,7 +3355,7 @@ static int mg_send_key(struct scsi_cmnd *srb, struct rtsx_chip *chip) }else {set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_INVALID_CMD_FIELD ); +SENSE_TYPE_MEDIA_INVALID_CMD_FIELD );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -3362,8 +3363,8 @@ static int mg_send_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)case KF_RSP_HOST :if ((scsi_bufflen (srb) ==0x0C ) && - (srb->cmnd[8 ] ==0x00 ) && - (srb->cmnd[9 ] ==0x0C )) { + (srb->cmnd[8 ] ==0x00 ) && + (srb->cmnd[9 ] ==0x0C )) { retval =mg_rsp (srb, chip);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);
@@ -3372,7 +3373,7 @@ static int mg_send_key(struct scsi_cmnd *srb, struct rtsx_chip *chip) }else {set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_INVALID_CMD_FIELD ); +SENSE_TYPE_MEDIA_INVALID_CMD_FIELD );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -3381,12 +3382,12 @@ static int mg_send_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)case KF_SET_ICV : ms_card->mg_entry_num = srb->cmnd[5 ];if ((scsi_bufflen (srb) ==0x404 ) && - (srb->cmnd[8 ] ==0x04 ) && - (srb->cmnd[9 ] ==0x04 ) && - (srb->cmnd[2 ] ==0x00 ) && - (srb->cmnd[3 ] ==0x00 ) && - (srb->cmnd[4 ] ==0x00 ) && - (srb->cmnd[5 ] <32 )) { + (srb->cmnd[8 ] ==0x04 ) && + (srb->cmnd[9 ] ==0x04 ) && + (srb->cmnd[2 ] ==0x00 ) && + (srb->cmnd[3 ] ==0x00 ) && + (srb->cmnd[4 ] ==0x00 ) && + (srb->cmnd[5 ] <32 )) { retval =mg_set_ICV (srb, chip);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);
@@ -3395,7 +3396,7 @@ static int mg_send_key(struct scsi_cmnd *srb, struct rtsx_chip *chip) }else {set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_INVALID_CMD_FIELD ); +SENSE_TYPE_MEDIA_INVALID_CMD_FIELD );rtsx_trace (chip);return TRANSPORT_FAILED ; }
@@ -3427,9 +3428,9 @@ int rtsx_scsi_handler(struct scsi_cmnd *srb, struct rtsx_chip *chip)* REQUEST_SENSE and rs_ppstatus */ if (!((srb->cmnd[0 ] ==VENDOR_CMND ) && - (srb->cmnd[1 ] ==SCSI_APP_CMD ) && - (srb->cmnd[2 ] ==GET_DEV_STATUS )) && - (srb->cmnd[0 ] !=REQUEST_SENSE )) { + (srb->cmnd[1 ] ==SCSI_APP_CMD ) && + (srb->cmnd[2 ] ==GET_DEV_STATUS )) && + (srb->cmnd[0 ] !=REQUEST_SENSE )) {/* Logical Unit Not Ready Format in Progress */ set_sense_data (chip, lun,CUR_ERR ,0x02 ,0 ,0x04 ,0x04 ,0 ,0 );
@@ -3440,12 +3441,12 @@ int rtsx_scsi_handler(struct scsi_cmnd *srb, struct rtsx_chip *chip)#endif if ((get_lun_card (chip, lun) ==MS_CARD ) && - (ms_card->format_status ==FORMAT_IN_PROGRESS )) { + (ms_card->format_status ==FORMAT_IN_PROGRESS )) {if ((srb->cmnd[0 ] !=REQUEST_SENSE ) && - (srb->cmnd[0 ] !=INQUIRY )) { + (srb->cmnd[0 ] !=INQUIRY )) {/* Logical Unit Not Ready Format in Progress */ set_sense_data (chip, lun,CUR_ERR ,0x02 ,0 ,0x04 ,0x04 , -0 , (u16)(ms_card->progress)); +0 , (u16)(ms_card->progress));rtsx_trace (chip);return TRANSPORT_FAILED ; }
Signature · 1 line
2.1.4
PATCH 15/45 staging: rts5208: Remove parentheses
In reply to Wayne PorterUnnecessary parentheses found by checkpatch
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/rtsx_scsi.c | 46 ++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 23 deletions(-)
drivers/staging/rts5208/rtsx_scsi.c +23 -23
@@ -400,7 +400,7 @@ void set_sense_data(struct rtsx_chip *chip, unsigned int lun, u8 err_code, u8 sense_key, u32 info, u8 asc, u8 ascq, u8 sns_key_info0, u16 sns_key_info1) { - struct sense_data_t *sense = &(chip->sense_buffer[lun]); + struct sense_data_t *sense = &chip->sense_buffer[lun]; sense->err_code = err_code; sense->sense_key = sense_key;
@@ -436,7 +436,7 @@ static int test_unit_ready(struct scsi_cmnd *srb, struct rtsx_chip *chip)#ifdef SUPPORT_SD_LOCK if (get_lun_card (chip,SCSI_LUN (srb)) ==SD_CARD ) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;if (sd_card->sd_lock_notify) { sd_card->sd_lock_notify =0 ;
@@ -615,10 +615,10 @@ static int request_sense(struct scsi_cmnd *srb, struct rtsx_chip *chip) {struct sense_data_t *sense;unsigned int lun =SCSI_LUN (srb); -struct ms_info *ms_card = &(chip->ms_card); +struct ms_info *ms_card = &chip->ms_card;unsigned char *tmp, *buf; - sense = &(chip->sense_buffer[lun]); + sense = &chip->sense_buffer[lun];if ((get_lun_card (chip, lun) ==MS_CARD ) && ms_card->pro_under_formatting) {
@@ -661,7 +661,7 @@ static int request_sense(struct scsi_cmnd *srb, struct rtsx_chip *chip)static void ms_mode_sense (struct rtsx_chip *chip,u8 cmd,int lun,u8 *buf,int buf_len) { -struct ms_info *ms_card = &(chip->ms_card); +struct ms_info *ms_card = &chip->ms_card;int sys_info_offset;int data_size = buf_len;bool support_format = false;
@@ -854,7 +854,7 @@ static int mode_sense(struct scsi_cmnd *srb, struct rtsx_chip *chip)static int read_write (struct scsi_cmnd *srb,struct rtsx_chip *chip) {#ifdef SUPPORT_SD_LOCK -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;#endif unsigned int lun =SCSI_LUN (srb);int retval;
@@ -1346,7 +1346,7 @@ static int write_mem(struct scsi_cmnd *srb, struct rtsx_chip *chip)static int get_sd_csd (struct scsi_cmnd *srb,struct rtsx_chip *chip) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;unsigned int lun =SCSI_LUN (srb);if (!check_card_ready (chip, lun)) {
@@ -1522,9 +1522,9 @@ static int set_variable(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (srb->cmnd[3 ] ==1 ) {/* Variable Clock */ -struct xd_info *xd_card = &(chip->xd_card); -struct sd_info *sd_card = &(chip->sd_card); -struct ms_info *ms_card = &(chip->ms_card); +struct xd_info *xd_card = &chip->xd_card; +struct sd_info *sd_card = &chip->sd_card; +struct ms_info *ms_card = &chip->ms_card;switch (srb->cmnd[4 ]) {case XD_CARD :
@@ -1586,9 +1586,9 @@ static int get_variable(struct scsi_cmnd *srb, struct rtsx_chip *chip)unsigned int lun =SCSI_LUN (srb);if (srb->cmnd[3 ] ==1 ) { -struct xd_info *xd_card = &(chip->xd_card); -struct sd_info *sd_card = &(chip->sd_card); -struct ms_info *ms_card = &(chip->ms_card); +struct xd_info *xd_card = &chip->xd_card; +struct sd_info *sd_card = &chip->sd_card; +struct ms_info *ms_card = &chip->ms_card;u8 tmp;switch (srb->cmnd[4 ]) {
@@ -1668,8 +1668,8 @@ static int dma_access_ring_buffer(struct scsi_cmnd *srb, struct rtsx_chip *chip)static int get_dev_status (struct scsi_cmnd *srb,struct rtsx_chip *chip) { -struct sd_info *sd_card = &(chip->sd_card); -struct ms_info *ms_card = &(chip->ms_card); +struct sd_info *sd_card = &chip->sd_card; +struct ms_info *ms_card = &chip->ms_card;int buf_len;unsigned int lun =SCSI_LUN (srb);u8 card =get_lun_card (chip, lun);
@@ -2671,7 +2671,7 @@ static int read_status(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (get_lun_card (chip, lun) ==XD_CARD ) { rtsx_status[13 ] =0x40 ; }else if (get_lun_card (chip, lun) ==SD_CARD ) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card; rtsx_status[13 ] =0x20 ;if (CHK_SD (sd_card)) {
@@ -2687,7 +2687,7 @@ static int read_status(struct scsi_cmnd *srb, struct rtsx_chip *chip) rtsx_status[13 ] |=0x04 ; } }else if (get_lun_card (chip, lun) ==MS_CARD ) { -struct ms_info *ms_card = &(chip->ms_card); +struct ms_info *ms_card = &chip->ms_card;if (CHK_MSPRO (ms_card)) { rtsx_status[13 ] =0x38 ;
@@ -2916,7 +2916,7 @@ void led_shine(struct scsi_cmnd *srb, struct rtsx_chip *chip)static int ms_format_cmnd (struct scsi_cmnd *srb,struct rtsx_chip *chip) { -struct ms_info *ms_card = &(chip->ms_card); +struct ms_info *ms_card = &chip->ms_card;unsigned int lun =SCSI_LUN (srb);bool quick_format;int retval;
@@ -2987,7 +2987,7 @@ static int ms_format_cmnd(struct scsi_cmnd *srb, struct rtsx_chip *chip)#ifdef SUPPORT_PCGL_1P18 static int get_ms_information (struct scsi_cmnd *srb,struct rtsx_chip *chip) { -struct ms_info *ms_card = &(chip->ms_card); +struct ms_info *ms_card = &chip->ms_card;unsigned int lun =SCSI_LUN (srb);u8 dev_info_id, data_len;u8 *buf;
@@ -3165,7 +3165,7 @@ static int sd_extension_cmnd(struct scsi_cmnd *srb, struct rtsx_chip *chip)#ifdef SUPPORT_MAGIC_GATE static int mg_report_key (struct scsi_cmnd *srb,struct rtsx_chip *chip) { -struct ms_info *ms_card = &(chip->ms_card); +struct ms_info *ms_card = &chip->ms_card;unsigned int lun =SCSI_LUN (srb);int retval;u8 key_format;
@@ -3278,7 +3278,7 @@ static int mg_report_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)static int mg_send_key (struct scsi_cmnd *srb,struct rtsx_chip *chip) { -struct ms_info *ms_card = &(chip->ms_card); +struct ms_info *ms_card = &chip->ms_card;unsigned int lun =SCSI_LUN (srb);int retval;u8 key_format;
@@ -3416,9 +3416,9 @@ static int mg_send_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)int rtsx_scsi_handler (struct scsi_cmnd *srb,struct rtsx_chip *chip) {#ifdef SUPPORT_SD_LOCK -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;#endif -struct ms_info *ms_card = &(chip->ms_card); +struct ms_info *ms_card = &chip->ms_card;unsigned int lun =SCSI_LUN (srb);int result;
Signature · 1 line
2.1.4
PATCH 16/45 staging: rts5208: CamelCase fixes
In reply to Wayne PorterChange camel case variables found by checkpatch
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/rtsx_scsi.c | 42 ++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 21 deletions(-)
drivers/staging/rts5208/rtsx_scsi.c +21 -21
@@ -754,10 +754,10 @@ static void ms_mode_sense(struct rtsx_chip *chip, u8 cmd,static int mode_sense (struct scsi_cmnd *srb,struct rtsx_chip *chip) {unsigned int lun =SCSI_LUN (srb); -unsigned int dataSize; +unsigned int data_size;int status;bool pro_formatter_flag; -unsigned char pageCode, *buf; +unsigned char page_code, *buf;u8 card =get_lun_card (chip, lun);#ifndef SUPPORT_MAGIC_GATE
@@ -770,11 +770,11 @@ static int mode_sense(struct scsi_cmnd *srb, struct rtsx_chip *chip)#endif pro_formatter_flag = false; - dataSize =8 ; + data_size =8 ;#ifdef SUPPORT_MAGIC_GATE if ((chip->lun2card[lun] &MS_CARD )) {if (!card || (card ==MS_CARD )) { - dataSize =108 ; + data_size =108 ;if (chip->mspro_formatter_enable) pro_formatter_flag = true; }
@@ -783,28 +783,28 @@ static int mode_sense(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (card ==MS_CARD ) {if (chip->mspro_formatter_enable) { pro_formatter_flag = true; - dataSize =108 ; + data_size =108 ; } }#endif - buf =kmalloc (dataSize,GFP_KERNEL ); + buf =kmalloc (data_size,GFP_KERNEL );if (!buf) {rtsx_trace (chip);return TRANSPORT_ERROR ; } - pageCode = srb->cmnd[2 ] &0x3f ; + page_code = srb->cmnd[2 ] &0x3f ; -if ((pageCode ==0x3F ) || (pageCode ==0x1C ) || - (pageCode ==0x00 ) || - (pro_formatter_flag && (pageCode ==0x20 ))) { +if ((page_code ==0x3F ) || (page_code ==0x1C ) || + (page_code ==0x00 ) || + (pro_formatter_flag && (page_code ==0x20 ))) {if (srb->cmnd[0 ] ==MODE_SENSE ) { -if ((pageCode ==0x3F ) || (pageCode ==0x20 )) { +if ((page_code ==0x3F ) || (page_code ==0x20 )) {ms_mode_sense (chip, srb->cmnd[0 ], - lun, buf, dataSize); + lun, buf, data_size); }else { - dataSize =4 ; + data_size =4 ; buf[0 ] =0x03 ; buf[1 ] =0x00 ;if (check_card_wp (chip, lun))
@@ -815,11 +815,11 @@ static int mode_sense(struct scsi_cmnd *srb, struct rtsx_chip *chip) buf[3 ] =0x00 ; } }else { -if ((pageCode ==0x3F ) || (pageCode ==0x20 )) { +if ((page_code ==0x3F ) || (page_code ==0x20 )) {ms_mode_sense (chip, srb->cmnd[0 ], - lun, buf, dataSize); + lun, buf, data_size); }else { - dataSize =8 ; + data_size =8 ; buf[0 ] =0x00 ; buf[1 ] =0x06 ; buf[2 ] =0x00 ;
@@ -842,7 +842,7 @@ static int mode_sense(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (status ==TRANSPORT_GOOD ) { unsigned int len = min_t(unsigned int, scsi_bufflen(srb), - dataSize); + data_size);rtsx_stor_set_xfer_buf (buf, len, srb);scsi_set_resid (srb,scsi_bufflen (srb) - len); }
@@ -981,7 +981,7 @@ static int read_write(struct scsi_cmnd *srb, struct rtsx_chip *chip) } retval =TRANSPORT_FAILED ;rtsx_trace (chip); - goto Exit; + goto exit; }else { chip->rw_fail_cnt[lun] =0 ; retval =TRANSPORT_GOOD ;
@@ -989,7 +989,7 @@ static int read_write(struct scsi_cmnd *srb, struct rtsx_chip *chip)scsi_set_resid (srb,0 ); -Exit: +exit:return retval; }
@@ -2356,11 +2356,11 @@ static int write_efuse(struct scsi_cmnd *srb, struct rtsx_chip *chip) SENSE_TYPE_MEDIA_WRITE_ERR); result =TRANSPORT_FAILED ;rtsx_trace (chip); - goto Exit; + goto exit; } } -Exit: +exit:vfree (buf); retval =card_power_off (chip,SPI_CARD );
Signature · 1 line
2.1.4
PATCH 17/45 staging: rts5208: Remove multiple assignment
In reply to Wayne PorterAssign values to variables on their own lines instead of using multiple assignment
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/rtsx_scsi.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/staging/rts5208/rtsx_scsi.c +7 -4
@@ -3022,10 +3022,13 @@ static int get_ms_information(struct scsi_cmnd *srb, struct rtsx_chip *chip)return TRANSPORT_FAILED ; } -if (dev_info_id ==0x15 ) - buf_len = data_len =0x3A ; -else - buf_len = data_len =0x6A ; +if (dev_info_id ==0x15 ) { + buf_len =0x3A ; + data_len =0x3A ; + }else { + buf_len =0x6A ; + data_len =0x6A ; + } buf =kmalloc (buf_len,GFP_KERNEL );if (!buf) {
Signature · 1 line
2.1.4
PATCH 18/45 staging: rts5208: Add braces to if()
In reply to Wayne PorterBraces should be around every part of the if block and not just the else if
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/rtsx_scsi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/staging/rts5208/rtsx_scsi.c +4 -3
@@ -2896,14 +2896,15 @@ void led_shine(struct scsi_cmnd *srb, struct rtsx_chip *chip)unsigned int lun =SCSI_LUN (srb);u16 sec_cnt; -if ((srb->cmnd[0 ] ==READ_10 ) || (srb->cmnd[0 ] ==WRITE_10 )) +if ((srb->cmnd[0 ] ==READ_10 ) || (srb->cmnd[0 ] ==WRITE_10 )) { sec_cnt = ((u16)(srb->cmnd[7 ]) <<8 ) | srb->cmnd[8 ]; -else if ((srb->cmnd[0 ] ==READ_6 ) || (srb->cmnd[0 ] ==WRITE_6 )) { + }else if ((srb->cmnd[0 ] ==READ_6 ) || (srb->cmnd[0 ] ==WRITE_6 )) { sec_cnt = srb->cmnd[4 ];if (sec_cnt ==0 ) sec_cnt =256 ; - }else + }else {return ; + }if (chip->rw_cap[lun] >=GPIO_TOGGLE_THRESHOLD ) {toggle_gpio (chip,LED_GPIO );
Signature · 1 line
2.1.4
PATCH 19/45 staging: rts5208: Add space around operator
In reply to Wayne PorterSpaces are preferred around operators for readability
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/rtsx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rts5208/rtsx.h +1 -1
@@ -149,7 +149,7 @@ static inline void get_current_time(u8 *timeval_buf, int buf_len)getnstimeofday64 (&ts64); - tv_usec = ts64.tv_nsec/NSEC_PER_USEC ; + tv_usec = ts64.tv_nsec /NSEC_PER_USEC ; timeval_buf[0 ] = (u8)(ts64.tv_sec >>24 ); timeval_buf[1 ] = (u8)(ts64.tv_sec >>16 );
Signature · 1 line
2.1.4
PATCH 20/45 staging: rts5208: Alignment fixes
In reply to Wayne PorterFix alignment issues that checkpatch found
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/rtsx_chip.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rts5208/rtsx_chip.h +3 -3
@@ -957,12 +957,12 @@ void rtsx_stop_cmd(struct rtsx_chip *chip, int card);int rtsx_write_register (struct rtsx_chip *chip,u16 addr,u8 mask,u8 data);int rtsx_read_register (struct rtsx_chip *chip,u16 addr,u8 *data);int rtsx_write_cfg_dw (struct rtsx_chip *chip, -u8 func_no,u16 addr,u32 mask,u32 val); +u8 func_no,u16 addr,u32 mask,u32 val);int rtsx_read_cfg_dw (struct rtsx_chip *chip,u8 func_no,u16 addr,u32 *val);int rtsx_write_cfg_seq (struct rtsx_chip *chip, -u8 func,u16 addr,u8 *buf,int len); +u8 func,u16 addr,u8 *buf,int len);int rtsx_read_cfg_seq (struct rtsx_chip *chip, -u8 func,u16 addr,u8 *buf,int len); +u8 func,u16 addr,u8 *buf,int len);int rtsx_write_phy_register (struct rtsx_chip *chip,u8 addr,u16 val);int rtsx_read_phy_register (struct rtsx_chip *chip,u8 addr,u16 *val);int rtsx_read_efuse (struct rtsx_chip *chip,u8 addr,u8 *val);
Signature · 1 line
2.1.4
PATCH 21/45 staging: rts5208: Long lines fixes
In reply to Wayne PorterBreak up long lines in rtsx_chip.h
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/rtsx_chip.h | 85 +++++++++++++++++++++++++------------ 1 file changed, 57 insertions(+), 28 deletions(-)
drivers/staging/rts5208/rtsx_chip.h +57 -28
@@ -285,7 +285,8 @@ struct sense_data_t {#define CARD_INT (XD_INT | MS_INT | SD_INT)#define NEED_COMPLETE_INT (DATA_DONE_INT | TRANS_OK_INT | TRANS_FAIL_INT) -#define RTSX_INT (CMD_DONE_INT | NEED_COMPLETE_INT | CARD_INT | GPIO0_INT | OC_INT) +#define RTSX_INT (CMD_DONE_INT | NEED_COMPLETE_INT | CARD_INT | \ + GPIO0_INT | OC_INT)#define CARD_EXIST (XD_EXIST | MS_EXIST | SD_EXIST)
@@ -393,14 +394,23 @@ struct zone_entry {/* SD card */ #define CHK_SD (sd_card) (((sd_card)->sd_type & 0xFF) == TYPE_SD) -#define CHK_SD_HS (sd_card) (CHK_SD(sd_card) && ((sd_card)->sd_type & SD_HS)) -#define CHK_SD_SDR50 (sd_card) (CHK_SD(sd_card) && ((sd_card)->sd_type & SD_SDR50)) -#define CHK_SD_DDR50 (sd_card) (CHK_SD(sd_card) && ((sd_card)->sd_type & SD_DDR50)) -#define CHK_SD_SDR104 (sd_card) (CHK_SD(sd_card) && ((sd_card)->sd_type & SD_SDR104)) -#define CHK_SD_HCXC (sd_card) (CHK_SD(sd_card) && ((sd_card)->sd_type & SD_HCXC)) -#define CHK_SD_HC (sd_card) (CHK_SD_HCXC(sd_card) && ((sd_card)->capacity <= 0x4000000)) -#define CHK_SD_XC (sd_card) (CHK_SD_HCXC(sd_card) && ((sd_card)->capacity > 0x4000000)) -#define CHK_SD30_SPEED (sd_card) (CHK_SD_SDR50(sd_card) || CHK_SD_DDR50(sd_card) || CHK_SD_SDR104(sd_card)) +#define CHK_SD_HS (sd_card) (CHK_SD(sd_card) && \ + ((sd_card)->sd_type & SD_HS)) +#define CHK_SD_SDR50 (sd_card) (CHK_SD(sd_card) && \ + ((sd_card)->sd_type & SD_SDR50)) +#define CHK_SD_DDR50 (sd_card) (CHK_SD(sd_card) && \ + ((sd_card)->sd_type & SD_DDR50)) +#define CHK_SD_SDR104 (sd_card) (CHK_SD(sd_card) && \ + ((sd_card)->sd_type & SD_SDR104)) +#define CHK_SD_HCXC (sd_card) (CHK_SD(sd_card) && \ + ((sd_card)->sd_type & SD_HCXC)) +#define CHK_SD_HC (sd_card) (CHK_SD_HCXC(sd_card) && \ + ((sd_card)->capacity <= 0x4000000)) +#define CHK_SD_XC (sd_card) (CHK_SD_HCXC(sd_card) && \ + ((sd_card)->capacity > 0x4000000)) +#define CHK_SD30_SPEED (sd_card) (CHK_SD_SDR50(sd_card) || \ + CHK_SD_DDR50(sd_card) || \ + CHK_SD_SDR104(sd_card))#define SET_SD (sd_card) ((sd_card)->sd_type = TYPE_SD)#define SET_SD_HS (sd_card) ((sd_card)->sd_type |= SD_HS)
@@ -416,13 +426,20 @@ struct zone_entry {#define CLR_SD_HCXC (sd_card) ((sd_card)->sd_type &= ~SD_HCXC)/* MMC card */ -#define CHK_MMC (sd_card) (((sd_card)->sd_type & 0xFF) == TYPE_MMC) -#define CHK_MMC_26M (sd_card) (CHK_MMC(sd_card) && ((sd_card)->sd_type & MMC_26M)) -#define CHK_MMC_52M (sd_card) (CHK_MMC(sd_card) && ((sd_card)->sd_type & MMC_52M)) -#define CHK_MMC_4BIT (sd_card) (CHK_MMC(sd_card) && ((sd_card)->sd_type & MMC_4BIT)) -#define CHK_MMC_8BIT (sd_card) (CHK_MMC(sd_card) && ((sd_card)->sd_type & MMC_8BIT)) -#define CHK_MMC_SECTOR_MODE (sd_card) (CHK_MMC(sd_card) && ((sd_card)->sd_type & MMC_SECTOR_MODE)) -#define CHK_MMC_DDR52 (sd_card) (CHK_MMC(sd_card) && ((sd_card)->sd_type & MMC_DDR52)) +#define CHK_MMC (sd_card) (((sd_card)->sd_type & 0xFF) == \ + TYPE_MMC) +#define CHK_MMC_26M (sd_card) (CHK_MMC(sd_card) && \ + ((sd_card)->sd_type & MMC_26M)) +#define CHK_MMC_52M (sd_card) (CHK_MMC(sd_card) && \ + ((sd_card)->sd_type & MMC_52M)) +#define CHK_MMC_4BIT (sd_card) (CHK_MMC(sd_card) && \ + ((sd_card)->sd_type & MMC_4BIT)) +#define CHK_MMC_8BIT (sd_card) (CHK_MMC(sd_card) && \ + ((sd_card)->sd_type & MMC_8BIT)) +#define CHK_MMC_SECTOR_MODE (sd_card) (CHK_MMC(sd_card) && \ + ((sd_card)->sd_type & MMC_SECTOR_MODE)) +#define CHK_MMC_DDR52 (sd_card) (CHK_MMC(sd_card) && \ + ((sd_card)->sd_type & MMC_DDR52))#define SET_MMC (sd_card) ((sd_card)->sd_type = TYPE_MMC)#define SET_MMC_26M (sd_card) ((sd_card)->sd_type |= MMC_26M)
@@ -439,7 +456,8 @@ struct zone_entry {#define CLR_MMC_SECTOR_MODE (sd_card) ((sd_card)->sd_type &= ~MMC_SECTOR_MODE)#define CLR_MMC_DDR52 (sd_card) ((sd_card)->sd_type &= ~MMC_DDR52) -#define CHK_MMC_HS (sd_card) (CHK_MMC_52M(sd_card) && CHK_MMC_26M(sd_card)) +#define CHK_MMC_HS (sd_card) (CHK_MMC_52M(sd_card) && \ + CHK_MMC_26M(sd_card))#define CLR_MMC_HS (sd_card) \ do { \ CLR_MMC_DDR52(sd_card); \
@@ -450,12 +468,18 @@ do { \#define SD_SUPPORT_CLASS_TEN 0x01#define SD_SUPPORT_1V8 0x02 -#define SD_SET_CLASS_TEN (sd_card) ((sd_card)->sd_setting |= SD_SUPPORT_CLASS_TEN) -#define SD_CHK_CLASS_TEN (sd_card) ((sd_card)->sd_setting & SD_SUPPORT_CLASS_TEN) -#define SD_CLR_CLASS_TEN (sd_card) ((sd_card)->sd_setting &= ~SD_SUPPORT_CLASS_TEN) -#define SD_SET_1V8 (sd_card) ((sd_card)->sd_setting |= SD_SUPPORT_1V8) -#define SD_CHK_1V8 (sd_card) ((sd_card)->sd_setting & SD_SUPPORT_1V8) -#define SD_CLR_1V8 (sd_card) ((sd_card)->sd_setting &= ~SD_SUPPORT_1V8) +#define SD_SET_CLASS_TEN (sd_card) ((sd_card)->sd_setting |= \ + SD_SUPPORT_CLASS_TEN) +#define SD_CHK_CLASS_TEN (sd_card) ((sd_card)->sd_setting & \ + SD_SUPPORT_CLASS_TEN) +#define SD_CLR_CLASS_TEN (sd_card) ((sd_card)->sd_setting &= \ + ~SD_SUPPORT_CLASS_TEN) +#define SD_SET_1V8 (sd_card) ((sd_card)->sd_setting |= \ + SD_SUPPORT_1V8) +#define SD_CHK_1V8 (sd_card) ((sd_card)->sd_setting & \ + SD_SUPPORT_1V8) +#define SD_CLR_1V8 (sd_card) ((sd_card)->sd_setting &= \ + ~SD_SUPPORT_1V8)struct sd_info {u16 sd_type;
@@ -544,9 +568,12 @@ struct xd_info {#define HG8BIT (MS_HG | MS_8BIT)#define CHK_MSPRO (ms_card) (((ms_card)->ms_type & 0xFF) == TYPE_MSPRO) -#define CHK_HG8BIT (ms_card) (CHK_MSPRO(ms_card) && (((ms_card)->ms_type & HG8BIT) == HG8BIT)) -#define CHK_MSXC (ms_card) (CHK_MSPRO(ms_card) && ((ms_card)->ms_type & MS_XC)) -#define CHK_MSHG (ms_card) (CHK_MSPRO(ms_card) && ((ms_card)->ms_type & MS_HG)) +#define CHK_HG8BIT (ms_card) (CHK_MSPRO(ms_card) && \ + (((ms_card)->ms_type & HG8BIT) == HG8BIT)) +#define CHK_MSXC (ms_card) (CHK_MSPRO(ms_card) && \ + ((ms_card)->ms_type & MS_XC)) +#define CHK_MSHG (ms_card) (CHK_MSPRO(ms_card) && \ + ((ms_card)->ms_type & MS_HG))#define CHK_MS8BIT (ms_card) (((ms_card)->ms_type & MS_8BIT))#define CHK_MS4BIT (ms_card) (((ms_card)->ms_type & MS_4BIT))
@@ -679,8 +706,10 @@ struct trace_msg_t {#define CLR_SDIO_EXIST (chip) ((chip)->sdio_func_exist &= ~SDIO_EXIST)#define CHK_SDIO_IGNORED (chip) ((chip)->sdio_func_exist & SDIO_IGNORED) -#define SET_SDIO_IGNORED (chip) ((chip)->sdio_func_exist |= SDIO_IGNORED) -#define CLR_SDIO_IGNORED (chip) ((chip)->sdio_func_exist &= ~SDIO_IGNORED) +#define SET_SDIO_IGNORED (chip) ((chip)->sdio_func_exist |= \ + SDIO_IGNORED) +#define CLR_SDIO_IGNORED (chip) ((chip)->sdio_func_exist &= \ + ~SDIO_IGNORED)struct rtsx_chip {struct rtsx_dev *rtsx;
Signature · 1 line
2.1.4
PATCH 22/45 staging: rts5208: Prefer using BIT macro
In reply to Wayne PorterReplace all instances of (1 << x) with BIT(x) to satisfy checkpatch check messages
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/rtsx_chip.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)
drivers/staging/rts5208/rtsx_chip.h +15 -15
@@ -291,18 +291,18 @@ struct sense_data_t {#define CARD_EXIST (XD_EXIST | MS_EXIST | SD_EXIST)/* Bus interrupt enable register */ -#define CMD_DONE_INT_EN (1 << 31) -#define DATA_DONE_INT_EN (1 << 30) -#define TRANS_OK_INT_EN (1 << 29) -#define TRANS_FAIL_INT_EN (1 << 28) -#define XD_INT_EN (1 << 27) -#define MS_INT_EN (1 << 26) -#define SD_INT_EN (1 << 25) -#define GPIO0_INT_EN (1 << 24) -#define OC_INT_EN (1 << 23) +#define CMD_DONE_INT_EN BIT(31) +#define DATA_DONE_INT_EN BIT(30) +#define TRANS_OK_INT_EN BIT(29) +#define TRANS_FAIL_INT_EN BIT(28) +#define XD_INT_EN BIT(27) +#define MS_INT_EN BIT(26) +#define SD_INT_EN BIT(25) +#define GPIO0_INT_EN BIT(24) +#define OC_INT_EN BIT(23)#define DELINK_INT_EN GPIO0_INT_EN -#define MS_OC_INT_EN (1 << 23) -#define SD_OC_INT_EN (1 << 22) +#define MS_OC_INT_EN BIT(23) +#define SD_OC_INT_EN BIT(22)#define READ_REG_CMD 0#define WRITE_REG_CMD 1
@@ -319,10 +319,10 @@ struct sense_data_t {#define MS_NR 3#define XD_NR 4#define SPI_NR 7 -#define SD_CARD (1 << SD_NR) -#define MS_CARD (1 << MS_NR) -#define XD_CARD (1 << XD_NR) -#define SPI_CARD (1 << SPI_NR) +#define SD_CARD BIT(SD_NR) +#define MS_CARD BIT(MS_NR) +#define XD_CARD BIT(XD_NR) +#define SPI_CARD BIT(SPI_NR)#define MAX_ALLOWED_LUN_CNT 8
Signature · 1 line
2.1.4
PATCH 23/45 staging: rts5208: Parenthesis alignment
In reply to Wayne PorterMatching open parenthesis
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/rtsx_card.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/staging/rts5208/rtsx_card.h +7 -7
@@ -1011,9 +1011,9 @@ int switch_normal_clock(struct rtsx_chip *chip, int clk);int enable_card_clock (struct rtsx_chip *chip,u8 card);int disable_card_clock (struct rtsx_chip *chip,u8 card);int card_rw (struct scsi_cmnd *srb,struct rtsx_chip *chip, -u32 sec_addr,u16 sec_cnt); +u32 sec_addr,u16 sec_cnt);void trans_dma_enable (enum dma_data_direction dir, -struct rtsx_chip *chip,u32 byte_cnt,u8 pack_size); +struct rtsx_chip *chip,u32 byte_cnt,u8 pack_size);void toggle_gpio (struct rtsx_chip *chip,u8 gpio);void turn_on_led (struct rtsx_chip *chip,u8 gpio);void turn_off_led (struct rtsx_chip *chip,u8 gpio);
@@ -1033,7 +1033,7 @@ static inline u32 get_card_size(struct rtsx_chip *chip, unsigned int lun)struct sd_info *sd_card = &(chip->sd_card);if ((get_lun_card (chip, lun) ==SD_CARD ) && - (sd_card->sd_lock_status &SD_LOCKED )) + (sd_card->sd_lock_status &SD_LOCKED ))return 0 ;return chip->capacity[lun];
@@ -1073,25 +1073,25 @@ static inline int card_power_off_all(struct rtsx_chip *chip)static inline void rtsx_clear_xd_error (struct rtsx_chip *chip) {rtsx_write_register (chip,CARD_STOP ,XD_STOP |XD_CLR_ERR , -XD_STOP |XD_CLR_ERR ); +XD_STOP |XD_CLR_ERR ); }static inline void rtsx_clear_sd_error (struct rtsx_chip *chip) {rtsx_write_register (chip,CARD_STOP ,SD_STOP |SD_CLR_ERR , -SD_STOP |SD_CLR_ERR ); +SD_STOP |SD_CLR_ERR ); }static inline void rtsx_clear_ms_error (struct rtsx_chip *chip) {rtsx_write_register (chip,CARD_STOP ,MS_STOP |MS_CLR_ERR , -MS_STOP |MS_CLR_ERR ); +MS_STOP |MS_CLR_ERR ); }static inline void rtsx_clear_spi_error (struct rtsx_chip *chip) {rtsx_write_register (chip,CARD_STOP ,SPI_STOP |SPI_CLR_ERR , -SPI_STOP |SPI_CLR_ERR ); +SPI_STOP |SPI_CLR_ERR ); }#ifdef SUPPORT_SDIO_ASPM
Signature · 1 line
2.1.4
PATCH 24/45 staging: rts5208: Unecessary parantheses
In reply to Wayne PorterRemove parentheses to stop checkpatch check message
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/rtsx_card.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rts5208/rtsx_card.h +1 -1
@@ -1030,7 +1030,7 @@ u8 get_lun_card(struct rtsx_chip *chip, unsigned int lun);static inline u32 get_card_size (struct rtsx_chip *chip,unsigned int lun) {#ifdef SUPPORT_SD_LOCK -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;if ((get_lun_card (chip, lun) ==SD_CARD ) && (sd_card->sd_lock_status &SD_LOCKED ))
Signature · 1 line
2.1.4
PATCH 25/45 staging: rts5208: Parenthesis alignment
In reply to Wayne PorterFix alignment to stop checkpath check messages
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/rtsx_card.c | 42 +++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 20 deletions(-)
drivers/staging/rts5208/rtsx_card.c +22 -20
@@ -100,9 +100,9 @@ void try_to_switch_sdio_ctrl(struct rtsx_chip *chip)if ((reg1 &0xC0 ) && (reg2 &0xC0 )) { chip->sd_int =1 ;rtsx_write_register (chip,SDIO_CTRL ,0xFF , -SDIO_BUS_CTRL |SDIO_CD_CTRL ); +SDIO_BUS_CTRL |SDIO_CD_CTRL );rtsx_write_register (chip,PWR_GATE_CTRL , -LDO3318_PWR_MASK ,LDO_ON ); +LDO3318_PWR_MASK ,LDO_ON ); } }
@@ -133,7 +133,7 @@ void dynamic_configure_sdio_aspm(struct rtsx_chip *chip)if (!chip->sdio_aspm) {dev_dbg (rtsx_dev (chip),"SDIO enter ASPM!\n" );rtsx_write_register (chip,ASPM_FORCE_CTL ,0xFC , -0x30 | (chip->aspm_level[1 ] <<2 )); +0x30 | (chip->aspm_level[1 ] <<2 )); chip->sdio_aspm =1 ; } }else {
@@ -300,7 +300,7 @@ static void release_sdio(struct rtsx_chip *chip) {if (chip->sd_io) {rtsx_write_register (chip,CARD_STOP ,SD_STOP |SD_CLR_ERR , -SD_STOP |SD_CLR_ERR ); +SD_STOP |SD_CLR_ERR );if (chip->chip_insert_with_sdio) { chip->chip_insert_with_sdio =0 ;
@@ -449,7 +449,7 @@ void rtsx_reinit_cards(struct rtsx_chip *chip, int reset_chip)#ifdef DISABLE_CARD_INT void card_cd_debounce (struct rtsx_chip *chip,unsigned long *need_reset, -unsigned long *need_release) +unsigned long *need_release) {u8 release_map =0 , reset_map =0 ;
@@ -502,13 +502,13 @@ void card_cd_debounce(struct rtsx_chip *chip, unsigned long *need_reset, reset_map =0 ;if (!(chip->card_exist &XD_CARD ) && - (xd_cnt > (DEBOUNCE_CNT -1 ))) + (xd_cnt > (DEBOUNCE_CNT -1 ))) reset_map |=XD_CARD ;if (!(chip->card_exist &SD_CARD ) && - (sd_cnt > (DEBOUNCE_CNT -1 ))) + (sd_cnt > (DEBOUNCE_CNT -1 ))) reset_map |=SD_CARD ;if (!(chip->card_exist &MS_CARD ) && - (ms_cnt > (DEBOUNCE_CNT -1 ))) + (ms_cnt > (DEBOUNCE_CNT -1 ))) reset_map |=MS_CARD ; }
@@ -556,8 +556,10 @@ void rtsx_init_cards(struct rtsx_chip *chip)if (chip->need_release) {if (chip->ocp_stat & (CARD_OC_NOW |CARD_OC_EVER ))rtsx_write_register (chip,OCPCLR , -CARD_OC_INT_CLR |CARD_OC_CLR , -CARD_OC_INT_CLR |CARD_OC_CLR ); +CARD_OC_INT_CLR | +CARD_OC_CLR , +CARD_OC_INT_CLR | +CARD_OC_CLR ); chip->ocp_stat =0 ; }#endif
@@ -590,9 +592,9 @@ void rtsx_init_cards(struct rtsx_chip *chip)release_xd_card (chip);if (CHECK_PID (chip,0x5288 ) && -CHECK_BARO_PKG (chip,QFN )) +CHECK_BARO_PKG (chip,QFN ))rtsx_write_register (chip,HOST_SLEEP_STATE , -0xC0 ,0xC0 ); +0xC0 ,0xC0 ); }if (chip->need_release &MS_CARD ) {
@@ -681,9 +683,9 @@ int switch_ssc_clock(struct rtsx_chip *chip, int clk)rtsx_add_cmd (chip,WRITE_REG_CMD ,SSC_CTL1 ,SSC_RSTB ,SSC_RSTB );if (sd_vpclk_phase_reset) {rtsx_add_cmd (chip,WRITE_REG_CMD ,SD_VPCLK0_CTL , -PHASE_NOT_RESET ,0 ); +PHASE_NOT_RESET ,0 );rtsx_add_cmd (chip,WRITE_REG_CMD ,SD_VPCLK0_CTL , -PHASE_NOT_RESET ,PHASE_NOT_RESET ); +PHASE_NOT_RESET ,PHASE_NOT_RESET ); } retval =rtsx_send_cmd (chip,0 ,WAIT_TIME );
@@ -850,7 +852,7 @@ int switch_normal_clock(struct rtsx_chip *chip, int clk) }void trans_dma_enable (enum dma_data_direction dir,struct rtsx_chip *chip, -u32 byte_cnt,u8 pack_size) +u32 byte_cnt,u8 pack_size) {if (pack_size >DMA_1024 ) pack_size =DMA_512 ;
@@ -864,11 +866,11 @@ void trans_dma_enable(enum dma_data_direction dir, struct rtsx_chip *chip,if (dir ==DMA_FROM_DEVICE ) {rtsx_add_cmd (chip,WRITE_REG_CMD ,DMACTL , -0x03 |DMA_PACK_SIZE_MASK , +0x03 |DMA_PACK_SIZE_MASK ,DMA_DIR_FROM_CARD |DMA_EN | pack_size); }else {rtsx_add_cmd (chip,WRITE_REG_CMD ,DMACTL , -0x03 |DMA_PACK_SIZE_MASK , +0x03 |DMA_PACK_SIZE_MASK ,DMA_DIR_TO_CARD |DMA_EN | pack_size); }
@@ -978,7 +980,7 @@ int card_power_off(struct rtsx_chip *chip, u8 card) }int card_rw (struct scsi_cmnd *srb,struct rtsx_chip *chip, -u32 sec_addr,u16 sec_cnt) +u32 sec_addr,u16 sec_cnt) {int retval;unsigned int lun =SCSI_LUN (srb);
@@ -1115,7 +1117,7 @@ void turn_on_led(struct rtsx_chip *chip, u8 gpio) {if (CHECK_PID (chip,0x5288 ))rtsx_write_register (chip,CARD_GPIO , (u8)(1 << gpio), - (u8)(1 << gpio)); + (u8)(1 << gpio));else rtsx_write_register (chip,CARD_GPIO , (u8)(1 << gpio),0 ); }
@@ -1126,7 +1128,7 @@ void turn_off_led(struct rtsx_chip *chip, u8 gpio)rtsx_write_register (chip,CARD_GPIO , (u8)(1 << gpio),0 ); else rtsx_write_register(chip, CARD_GPIO, (u8)(1 << gpio), - (u8)(1 << gpio)); + (u8)(1 << gpio)); } int detect_card_cd(struct rtsx_chip *chip, int card)
Signature · 1 line
2.1.4
PATCH 26/45 staging: rts5208: Unnecessary parentheses
In reply to Wayne PorterRemove parentheses found by checkpatch
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/rtsx_card.c | 48 ++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 24 deletions(-)
drivers/staging/rts5208/rtsx_card.c +24 -24
@@ -33,11 +33,11 @@void do_remaining_work (struct rtsx_chip *chip) { -struct sd_info *sd_card = &(chip->sd_card); +struct sd_info *sd_card = &chip->sd_card;#ifdef XD_DELAY_WRITE -struct xd_info *xd_card = &(chip->xd_card); +struct xd_info *xd_card = &chip->xd_card;#endif -struct ms_info *ms_card = &(chip->ms_card); +struct ms_info *ms_card = &chip->ms_card;if (chip->card_ready &SD_CARD ) {if (sd_card->seq_mode) {
@@ -154,7 +154,7 @@ void do_reset_sd_card(struct rtsx_chip *chip) chip->sd_reset_counter, chip->card2lun[SD_CARD]);if (chip->card2lun[SD_CARD ] >=MAX_ALLOWED_LUN_CNT ) { -clear_bit (SD_NR , &(chip->need_reset)); +clear_bit (SD_NR , &chip->need_reset); chip->sd_reset_counter =0 ; chip->sd_show_cnt =0 ;return ;
@@ -169,7 +169,7 @@ void do_reset_sd_card(struct rtsx_chip *chip)if (chip->need_release &SD_CARD )return ;if (retval ==STATUS_SUCCESS ) { -clear_bit (SD_NR , &(chip->need_reset)); +clear_bit (SD_NR , &chip->need_reset); chip->sd_reset_counter =0 ; chip->sd_show_cnt =0 ; chip->card_ready |=SD_CARD ;
@@ -177,7 +177,7 @@ void do_reset_sd_card(struct rtsx_chip *chip) chip->rw_card[chip->card2lun[SD_CARD ]] = sd_rw; }else {if (chip->sd_io || (chip->sd_reset_counter >=MAX_RESET_CNT )) { -clear_bit (SD_NR , &(chip->need_reset)); +clear_bit (SD_NR , &chip->need_reset); chip->sd_reset_counter =0 ; chip->sd_show_cnt =0 ; }else {
@@ -208,7 +208,7 @@ void do_reset_xd_card(struct rtsx_chip *chip) chip->xd_reset_counter, chip->card2lun[XD_CARD]);if (chip->card2lun[XD_CARD ] >=MAX_ALLOWED_LUN_CNT ) { -clear_bit (XD_NR , &(chip->need_reset)); +clear_bit (XD_NR , &chip->need_reset); chip->xd_reset_counter =0 ; chip->xd_show_cnt =0 ;return ;
@@ -223,14 +223,14 @@ void do_reset_xd_card(struct rtsx_chip *chip)if (chip->need_release &XD_CARD )return ;if (retval ==STATUS_SUCCESS ) { -clear_bit (XD_NR , &(chip->need_reset)); +clear_bit (XD_NR , &chip->need_reset); chip->xd_reset_counter =0 ; chip->card_ready |=XD_CARD ; chip->card_fail &= ~XD_CARD ; chip->rw_card[chip->card2lun[XD_CARD ]] = xd_rw; }else {if (chip->xd_reset_counter >=MAX_RESET_CNT ) { -clear_bit (XD_NR , &(chip->need_reset)); +clear_bit (XD_NR , &chip->need_reset); chip->xd_reset_counter =0 ; chip->xd_show_cnt =0 ; }else {
@@ -256,7 +256,7 @@ void do_reset_ms_card(struct rtsx_chip *chip) chip->ms_reset_counter, chip->card2lun[MS_CARD]);if (chip->card2lun[MS_CARD ] >=MAX_ALLOWED_LUN_CNT ) { -clear_bit (MS_NR , &(chip->need_reset)); +clear_bit (MS_NR , &chip->need_reset); chip->ms_reset_counter =0 ; chip->ms_show_cnt =0 ;return ;
@@ -271,14 +271,14 @@ void do_reset_ms_card(struct rtsx_chip *chip)if (chip->need_release &MS_CARD )return ;if (retval ==STATUS_SUCCESS ) { -clear_bit (MS_NR , &(chip->need_reset)); +clear_bit (MS_NR , &chip->need_reset); chip->ms_reset_counter =0 ; chip->card_ready |=MS_CARD ; chip->card_fail &= ~MS_CARD ; chip->rw_card[chip->card2lun[MS_CARD ]] = ms_rw; }else {if (chip->ms_reset_counter >=MAX_RESET_CNT ) { -clear_bit (MS_NR , &(chip->need_reset)); +clear_bit (MS_NR , &chip->need_reset); chip->ms_reset_counter =0 ; chip->ms_show_cnt =0 ; }else {
@@ -369,7 +369,7 @@ void rtsx_reset_cards(struct rtsx_chip *chip)rtsx_disable_aspm (chip);if ((chip->need_reset &SD_CARD ) && chip->chip_insert_with_sdio) -clear_bit (SD_NR , &(chip->need_reset)); +clear_bit (SD_NR , &chip->need_reset);if (chip->need_reset &XD_CARD ) { chip->card_exist |=XD_CARD ;
@@ -381,8 +381,8 @@ void rtsx_reset_cards(struct rtsx_chip *chip) }if (CHECK_PID (chip,0x5288 ) &&CHECK_BARO_PKG (chip,QFN )) {if (chip->card_exist &XD_CARD ) { -clear_bit (SD_NR , &(chip->need_reset)); -clear_bit (MS_NR , &(chip->need_reset)); +clear_bit (SD_NR , &chip->need_reset); +clear_bit (MS_NR , &chip->need_reset); } }if (chip->need_reset &SD_CARD ) {
@@ -531,23 +531,23 @@ void rtsx_init_cards(struct rtsx_chip *chip) }#ifdef DISABLE_CARD_INT -card_cd_debounce (chip, &(chip->need_reset), &(chip->need_release)); +card_cd_debounce (chip, &chip->need_reset, &chip->need_release);#endif if (chip->need_release) {if (CHECK_PID (chip,0x5288 ) &&CHECK_BARO_PKG (chip,QFN )) {if (chip->int_reg &XD_EXIST ) { -clear_bit (SD_NR , &(chip->need_release)); -clear_bit (MS_NR , &(chip->need_release)); +clear_bit (SD_NR , &chip->need_release); +clear_bit (MS_NR , &chip->need_release); } }if (!(chip->card_exist &SD_CARD ) && !chip->sd_io) -clear_bit (SD_NR , &(chip->need_release)); +clear_bit (SD_NR , &chip->need_release);if (!(chip->card_exist &XD_CARD )) -clear_bit (XD_NR , &(chip->need_release)); +clear_bit (XD_NR , &chip->need_release);if (!(chip->card_exist &MS_CARD )) -clear_bit (MS_NR , &(chip->need_release)); +clear_bit (MS_NR , &chip->need_release);dev_dbg (rtsx_dev (chip),"chip->need_release = 0x%x\n" , (unsigned int )(chip->need_release));
@@ -569,7 +569,7 @@ void rtsx_init_cards(struct rtsx_chip *chip) }if (chip->need_release &SD_CARD ) { -clear_bit (SD_NR , &(chip->need_release)); +clear_bit (SD_NR , &chip->need_release); chip->card_exist &= ~SD_CARD ; chip->card_ejected &= ~SD_CARD ; chip->card_fail &= ~SD_CARD ;
@@ -582,7 +582,7 @@ void rtsx_init_cards(struct rtsx_chip *chip) }if (chip->need_release &XD_CARD ) { -clear_bit (XD_NR , &(chip->need_release)); +clear_bit (XD_NR , &chip->need_release); chip->card_exist &= ~XD_CARD ; chip->card_ejected &= ~XD_CARD ; chip->card_fail &= ~XD_CARD ;
@@ -598,7 +598,7 @@ void rtsx_init_cards(struct rtsx_chip *chip) }if (chip->need_release &MS_CARD ) { -clear_bit (MS_NR , &(chip->need_release)); +clear_bit (MS_NR , &chip->need_release); chip->card_exist &= ~MS_CARD ; chip->card_ejected &= ~MS_CARD ; chip->card_fail &= ~MS_CARD ;
Signature · 1 line
2.1.4
PATCH 27/45 staging: rts5208: Spacing
In reply to Wayne PorterAdding space around operator for better readability and to stop checkpatch check messages
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/rtsx_card.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rts5208/rtsx_card.c +1 -1
@@ -652,7 +652,7 @@ int switch_ssc_clock(struct rtsx_chip *chip, int clk)return STATUS_FAIL ; } - mcu_cnt = (u8)(125 /clk +3 ); + mcu_cnt = (u8)(125 / clk +3 );if (mcu_cnt >7 ) mcu_cnt =7 ;
Signature · 1 line
2.1.4
PATCH 28/45 staging: rts5208: Comparison to NULL
In reply to Wayne PorterFix to resolve checkpatch message
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/rtsx_card.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rts5208/rtsx_card.c +1 -1
@@ -986,7 +986,7 @@ int card_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip,unsigned int lun =SCSI_LUN (srb);int i; -if (chip->rw_card[lun] ==NULL ) { +if (!chip->rw_card[lun]) {rtsx_trace (chip);return STATUS_FAIL ; }
Signature · 1 line
2.1.4
PATCH 29/45 staging: rts5208: rtsx.c: Unnecessary parentheses
In reply to Wayne PorterRemove parentheses found by checkpatch
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/rtsx.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/staging/rts5208/rtsx.c +5 -5
@@ -485,7 +485,7 @@ static int rtsx_control_thread(void *__dev) }if (rtsx_chk_stat (chip,RTSX_STAT_ABORT )) { -complete (&(dev->notify)); +complete (&dev->notify);rtsx_set_stat (chip,RTSX_STAT_IDLE ); }
@@ -519,9 +519,9 @@ static int rtsx_polling_thread(void *__dev) {struct rtsx_dev *dev = __dev;struct rtsx_chip *chip = dev->chip; -struct sd_info *sd_card = &(chip->sd_card); -struct xd_info *xd_card = &(chip->xd_card); -struct ms_info *ms_card = &(chip->ms_card); +struct sd_info *sd_card = &chip->sd_card; +struct xd_info *xd_card = &chip->xd_card; +struct ms_info *ms_card = &chip->ms_card; sd_card->cleanup_counter =0 ; xd_card->cleanup_counter =0 ;
@@ -890,7 +890,7 @@ static int rtsx_probe(struct pci_dev *pci,init_completion (&dev->cmnd_ready);init_completion (&dev->control_exit);init_completion (&dev->polling_exit); -init_completion (&(dev->notify)); +init_completion (&dev->notify);init_completion (&dev->scanning_done);init_waitqueue_head (&dev->delay_wait);
Signature · 1 line
2.1.4
PATCH 30/45 staging: rts5208: rtsx.c: Alignment
In reply to Wayne PorterFix to match open parenthesis in order to satisfy checkpatch
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/rtsx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rts5208/rtsx.c +2 -2
@@ -125,7 +125,7 @@ static int slave_configure(struct scsi_device *sdev)/* queue a command */ /* This is always called with scsi_lock(host) held */ static int queuecommand_lck (struct scsi_cmnd *srb, -void (*done)(struct scsi_cmnd *)) +void (*done)(struct scsi_cmnd *)) {struct rtsx_dev *dev =host_to_rtsx (srb->device->host);struct rtsx_chip *chip = dev->chip;
@@ -844,7 +844,7 @@ static void rtsx_init_options(struct rtsx_chip *chip) }static int rtsx_probe (struct pci_dev *pci, -const struct pci_device_id *pci_id) +const struct pci_device_id *pci_id) {struct Scsi_Host *host;struct rtsx_dev *dev;
Signature · 1 line
2.1.4
PATCH 31/45 staging: rts5208: rtsx.c: Multiple assignments
In reply to Wayne PorterFix multiple assignments found by checkpatch
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/rtsx.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/staging/rts5208/rtsx.c +4 -2
@@ -107,8 +107,10 @@ static int slave_configure(struct scsi_device *sdev)* the actual value or the modified one, depending on where the * data comes from. */ -if (sdev->scsi_level <SCSI_2 ) - sdev->scsi_level = sdev->sdev_target->scsi_level =SCSI_2 ; +if (sdev->scsi_level <SCSI_2 ) { + sdev->scsi_level =SCSI_2 ; + sdev->sdev_target->scsi_level =SCSI_2 ; + }return 0 ; }
Signature · 1 line
2.1.4
PATCH 32/45 staging: rts5208: rtsx.c: Spacing
In reply to Wayne PorterAdd spaces around operator for readability
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/rtsx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/staging/rts5208/rtsx.c +4 -1
@@ -122,7 +122,10 @@ static int slave_configure(struct scsi_device *sdev)/* we use this macro to help us write into the buffer */ #undef SPRINTF #define SPRINTF(args...) \ - do { if (pos < buffer+length) pos += sprintf(pos, ## args); } while (0) + do { \ + if (pos < buffer + length) \ + pos += sprintf(pos, ## args); \ + } while (0)/* queue a command */ /* This is always called with scsi_lock(host) held */
Signature · 1 line
2.1.4
PATCH 33/45 staging: rts5208: rtsx.c: CamelCase
In reply to Wayne PorterMake camel case labels all lowercase
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/rtsx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rts5208/rtsx.c +4 -4
@@ -438,7 +438,7 @@ static int rtsx_control_thread(void *__dev)/* has the command aborted ? */ if (rtsx_chk_stat (chip,RTSX_STAT_ABORT )) { chip->srb->result =DID_ABORT <<16 ; - goto SkipForAbort; + goto skip_for_abort; }scsi_unlock (host);
@@ -485,7 +485,7 @@ static int rtsx_control_thread(void *__dev)else if (chip->srb->result !=DID_ABORT <<16 ) { chip->srb->scsi_done (chip->srb); }else { -SkipForAbort: +skip_for_abort:dev_err (&dev->pci->dev,"scsi command aborted\n" ); }
@@ -602,7 +602,7 @@ static irqreturn_t rtsx_interrupt(int irq, void *dev_id) dev->trans_result =TRANS_RESULT_FAIL ;if (dev->done)complete (dev->done); - goto Exit; + goto exit; } }
@@ -624,7 +624,7 @@ static irqreturn_t rtsx_interrupt(int irq, void *dev_id) } } -Exit: +exit:spin_unlock (&dev->reg_lock);return IRQ_HANDLED ; }
Signature · 1 line
2.1.4
PATCH 34/45 staging: rts5208: rtsx.c: Spacing
In reply to Wayne PorterRemove blank line after opening {
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/rtsx.c | 1 - 1 file changed, 1 deletion(-)
drivers/staging/rts5208/rtsx.c +0 -1
@@ -536,7 +536,6 @@ static int rtsx_polling_thread(void *__dev)wait_timeout ((delay_use +5 ) *1000 );for (;;) { -set_current_state (TASK_INTERRUPTIBLE );schedule_timeout (msecs_to_jiffies (POLLING_INTERVAL ));
Signature · 1 line
2.1.4
PATCH 35/45 staging: rts5208: rtsx.c: Alloc sizeof struct
In reply to Wayne PorterSatisfy checkpatch message: Prefer kzalloc(sizeof(*dev->chip)...) over kzalloc(sizeof(struct rtsx_chip)...)
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/rtsx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rts5208/rtsx.c +1 -1
@@ -883,7 +883,7 @@ static int rtsx_probe(struct pci_dev *pci, dev =host_to_rtsx (host);memset (dev,0 ,sizeof (struct rtsx_dev )); - dev->chip =kzalloc (sizeof (struct rtsx_chip ),GFP_KERNEL ); + dev->chip =kzalloc (sizeof (dev->chip),GFP_KERNEL );if (!dev->chip) { err = -ENOMEM ; goto errout;
Signature · 1 line
2.1.4
PATCH 36/45 staging: rts5208: ms.h: Parenthesis alignment
In reply to Wayne PorterFix alignment to match open parenthesis
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/ms.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rts5208/ms.h +2 -2
@@ -202,9 +202,9 @@ void mspro_polling_format_status(struct rtsx_chip *chip);void mspro_stop_seq_mode (struct rtsx_chip *chip);int reset_ms_card (struct rtsx_chip *chip);int ms_rw (struct scsi_cmnd *srb,struct rtsx_chip *chip, -u32 start_sector,u16 sector_cnt); +u32 start_sector,u16 sector_cnt);int mspro_format (struct scsi_cmnd *srb,struct rtsx_chip *chip, -int short_data_len,bool quick_format); +int short_data_len,bool quick_format);void ms_free_l2p_tbl (struct rtsx_chip *chip);void ms_cleanup_work (struct rtsx_chip *chip);int ms_power_off_card3v3 (struct rtsx_chip *chip);
Signature · 1 line
2.1.4
PATCH 37/45 staging: rts5208: ms.c: Parenthesis alignment
In reply to Wayne PorterFix checkpatch messages: Alignment should match open parenthesis
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/ms.c | 288 ++++++++++++++++++++++--------------------- 1 file changed, 150 insertions(+), 138 deletions(-)
drivers/staging/rts5208/ms.c +150 -138
@@ -507,17 +507,17 @@ static int ms_pull_ctl_enable(struct rtsx_chip *chip)if (CHECK_PID (chip,0x5208 )) {rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_PULL_CTL1 ,0xFF , -MS_D1_PD |MS_D2_PD |MS_CLK_NP |MS_D6_PD ); +MS_D1_PD |MS_D2_PD |MS_CLK_NP |MS_D6_PD );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_PULL_CTL2 ,0xFF , -MS_D3_PD |MS_D0_PD |MS_BS_NP |XD_D4_PD ); +MS_D3_PD |MS_D0_PD |MS_BS_NP |XD_D4_PD );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_PULL_CTL3 ,0xFF , -MS_D7_PD |XD_CE_PD |XD_CLE_PD |XD_CD_PU ); +MS_D7_PD |XD_CE_PD |XD_CLE_PD |XD_CD_PU );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_PULL_CTL4 ,0xFF , -XD_RDY_PD |SD_D3_PD |SD_D2_PD |XD_ALE_PD ); +XD_RDY_PD |SD_D3_PD |SD_D2_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,
@@ -665,7 +665,7 @@ static int ms_identify_media_type(struct rtsx_chip *chip, int switch_8bit_bus)for (i =0 ; i <MS_MAX_RETRY_COUNT ; i++) { retval =ms_transfer_tpc (chip,MS_TM_READ_BYTES ,READ_REG , -6 ,NO_WAIT_INT ); +6 ,NO_WAIT_INT );if (retval ==STATUS_SUCCESS )break ; }
@@ -765,7 +765,7 @@ static int ms_confirm_cpu_startup(struct rtsx_chip *chip)for (i =0 ; i <MS_MAX_RETRY_COUNT ; i++) { retval =ms_read_bytes (chip,GET_INT ,1 , -NO_WAIT_INT , &val,1 ); +NO_WAIT_INT , &val,1 );if (retval ==STATUS_SUCCESS )break ; }
@@ -861,7 +861,7 @@ static int ms_switch_8bit_bus(struct rtsx_chip *chip)for (i =0 ; i <MS_MAX_RETRY_COUNT ; i++) { retval =ms_transfer_tpc (chip,MS_TM_READ_BYTES ,GET_INT , -1 ,NO_WAIT_INT ); +1 ,NO_WAIT_INT );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -1061,8 +1061,8 @@ static int ms_read_attribute_info(struct rtsx_chip *chip)return STATUS_FAIL ; } retval =ms_transfer_data (chip,MS_TM_AUTO_READ , -PRO_READ_LONG_DATA ,0x40 ,WAIT_INT , -0 ,0 , buf,64 *512 ); +PRO_READ_LONG_DATA ,0x40 ,WAIT_INT , +0 ,0 , buf,64 *512 );if (retval ==STATUS_SUCCESS )break ;
@@ -1087,7 +1087,7 @@ static int ms_read_attribute_info(struct rtsx_chip *chip)break ; retval =ms_transfer_tpc (chip,MS_TM_NORMAL_READ , -PRO_READ_LONG_DATA ,0 ,WAIT_INT ); +PRO_READ_LONG_DATA ,0 ,WAIT_INT );if (retval !=STATUS_SUCCESS ) {kfree (buf);rtsx_trace (chip);
@@ -1121,7 +1121,7 @@ static int ms_read_attribute_info(struct rtsx_chip *chip)#ifdef SUPPORT_MSXC if ((buf[cur_addr_off +8 ] ==0x10 ) || - (buf[cur_addr_off +8 ] ==0x13 )) { + (buf[cur_addr_off +8 ] ==0x13 )) {#else if (buf[cur_addr_off +8 ] ==0x10 ) {#endif
@@ -1264,7 +1264,7 @@ static int ms_read_attribute_info(struct rtsx_chip *chip)if (device_type !=0x00 ) {if ((device_type ==0x01 ) || (device_type ==0x02 ) || - (device_type ==0x03 )) { + (device_type ==0x03 )) { chip->card_wp |=MS_CARD ; }else {rtsx_trace (chip);
@@ -1298,7 +1298,7 @@ static int ms_read_attribute_info(struct rtsx_chip *chip)#ifdef SUPPORT_MAGIC_GATE static int mg_set_tpc_para_sub (struct rtsx_chip *chip, -int type,u8 mg_entry_num); +int type,u8 mg_entry_num);#endif static int reset_ms_pro (struct rtsx_chip *chip)
@@ -1365,7 +1365,7 @@ static int reset_ms_pro(struct rtsx_chip *chip) change_power_class = power_class_mode;if (change_power_class) { retval =msxc_change_power (chip, - change_power_class); + change_power_class);if (retval !=STATUS_SUCCESS ) { change_power_class--; goto Retry;
@@ -1418,14 +1418,14 @@ static int ms_read_status_reg(struct rtsx_chip *chip) }static int ms_read_extra_data (struct rtsx_chip *chip, -u16 block_addr,u8 page_num,u8 *buf,int buf_len) +u16 block_addr,u8 page_num,u8 *buf,int buf_len) {struct ms_info *ms_card = &chip->ms_card;int retval, i;u8 val, data[10 ]; retval =ms_set_rw_reg_addr (chip, OverwriteFlag,MS_EXTRA_SIZE , - SystemParm,6 ); + SystemParm,6 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -1488,7 +1488,8 @@ static int ms_read_extra_data(struct rtsx_chip *chip, } retval =ms_set_rw_reg_addr (chip, OverwriteFlag, -MS_EXTRA_SIZE , SystemParm,6 ); +MS_EXTRA_SIZE , SystemParm, +6 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -1497,7 +1498,7 @@ static int ms_read_extra_data(struct rtsx_chip *chip, } retval =ms_read_bytes (chip,READ_REG ,MS_EXTRA_SIZE ,NO_WAIT_INT , - data,MS_EXTRA_SIZE ); + data,MS_EXTRA_SIZE );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -1512,8 +1513,8 @@ static int ms_read_extra_data(struct rtsx_chip *chip,return STATUS_SUCCESS ; } -static int ms_write_extra_data (struct rtsx_chip *chip, -u16 block_addr,u8 page_num,u8 *buf,int buf_len) +static int ms_write_extra_data (struct rtsx_chip *chip,u16 block_addr, +u8 page_num,u8 *buf,int buf_len) {struct ms_info *ms_card = &chip->ms_card;int retval, i;
@@ -1525,7 +1526,7 @@ static int ms_write_extra_data(struct rtsx_chip *chip, } retval =ms_set_rw_reg_addr (chip, OverwriteFlag,MS_EXTRA_SIZE , - SystemParm,6 +MS_EXTRA_SIZE ); + SystemParm,6 +MS_EXTRA_SIZE );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -1588,7 +1589,7 @@ static int ms_read_page(struct rtsx_chip *chip, u16 block_addr, u8 page_num)u8 val, data[6 ]; retval =ms_set_rw_reg_addr (chip, OverwriteFlag,MS_EXTRA_SIZE , - SystemParm,6 ); + SystemParm,6 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -1651,7 +1652,7 @@ 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 ); +0 ,NO_WAIT_INT );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -1678,7 +1679,7 @@ static int ms_set_bad_block(struct rtsx_chip *chip, u16 phy_blk) } retval =ms_set_rw_reg_addr (chip, OverwriteFlag,MS_EXTRA_SIZE , - SystemParm,7 ); + SystemParm,7 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -1742,7 +1743,7 @@ static int ms_erase_block(struct rtsx_chip *chip, u16 phy_blk)u8 val, data[6 ]; retval =ms_set_rw_reg_addr (chip, OverwriteFlag,MS_EXTRA_SIZE , - SystemParm,6 ); + SystemParm,6 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -1844,7 +1845,7 @@ 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 ); + extra,MS_EXTRA_SIZE );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -1855,7 +1856,7 @@ static int ms_init_page(struct rtsx_chip *chip, u16 phy_blk, u16 log_blk, }static int ms_copy_page (struct rtsx_chip *chip,u16 old_blk,u16 new_blk, -u16 log_blk,u8 start_page,u8 end_page) +u16 log_blk,u8 start_page,u8 end_page) {struct ms_info *ms_card = &chip->ms_card;bool uncorrect_flag = false;
@@ -1915,7 +1916,7 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,ms_read_extra_data (chip, old_blk, i, extra,MS_EXTRA_SIZE ); retval =ms_set_rw_reg_addr (chip, OverwriteFlag, -MS_EXTRA_SIZE , SystemParm,6 ); +MS_EXTRA_SIZE , SystemParm,6 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -1971,9 +1972,9 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk, } retval =ms_transfer_tpc (chip, -MS_TM_NORMAL_READ , -READ_PAGE_DATA , -0 ,NO_WAIT_INT ); +MS_TM_NORMAL_READ , +READ_PAGE_DATA , +0 ,NO_WAIT_INT );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -1981,20 +1982,24 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,if (uncorrect_flag) {ms_set_page_status (log_blk, setPS_NG, - extra,MS_EXTRA_SIZE ); + extra, +MS_EXTRA_SIZE );if (i ==0 ) extra[0 ] &=0xEF ;ms_write_extra_data (chip, old_blk, i, - extra,MS_EXTRA_SIZE ); + extra, +MS_EXTRA_SIZE );dev_dbg (rtsx_dev (chip),"page %d : extra[0] = 0x%x\n" , i, extra[0 ]);MS_SET_BAD_BLOCK_FLG (ms_card);ms_set_page_status (log_blk, setPS_Error, - extra,MS_EXTRA_SIZE ); + extra, +MS_EXTRA_SIZE );ms_write_extra_data (chip, new_blk, i, - extra,MS_EXTRA_SIZE ); + extra, +MS_EXTRA_SIZE );continue ; }
@@ -2021,8 +2026,8 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk, } } - retval =ms_set_rw_reg_addr (chip, OverwriteFlag, -MS_EXTRA_SIZE , SystemParm, (6 +MS_EXTRA_SIZE )); + retval =ms_set_rw_reg_addr (chip, OverwriteFlag,MS_EXTRA_SIZE , + SystemParm, (6 +MS_EXTRA_SIZE ));ms_set_err_code (chip,MS_NO_ERROR );
@@ -2085,7 +2090,8 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,if (i ==0 ) { retval =ms_set_rw_reg_addr (chip, OverwriteFlag, -MS_EXTRA_SIZE , SystemParm,7 ); +MS_EXTRA_SIZE , SystemParm, +7 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -2121,7 +2127,7 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,ms_set_err_code (chip,MS_NO_ERROR ); retval =ms_read_bytes (chip,GET_INT ,1 , -NO_WAIT_INT , &val,1 ); +NO_WAIT_INT , &val,1 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -2361,7 +2367,7 @@ static int reset_ms(struct rtsx_chip *chip) } retval =ms_transfer_tpc (chip,MS_TM_WRITE_BYTES ,WRITE_REG ,1 , -NO_WAIT_INT ); +NO_WAIT_INT );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -2474,7 +2480,7 @@ static u16 ms_get_l2p_tbl(struct rtsx_chip *chip, int seg_no, u16 log_off) }static void ms_set_l2p_tbl (struct rtsx_chip *chip, -int seg_no,u16 log_off,u16 phy_blk) +int seg_no,u16 log_off,u16 phy_blk) {struct ms_info *ms_card = &chip->ms_card;struct zone_entry *segment;
@@ -2530,7 +2536,7 @@ static const unsigned short ms_start_idx[] = {0, 494, 990, 1486, 1982, 2478, 7934};static int ms_arbitrate_l2p (struct rtsx_chip *chip,u16 phy_blk, -u16 log_off,u8 us1,u8 us2) +u16 log_off,u8 us1,u8 us2) {struct ms_info *ms_card = &chip->ms_card;struct zone_entry *segment;
@@ -2646,7 +2652,7 @@ static int ms_build_l2p_tbl(struct rtsx_chip *chip, int seg_no) } retval =ms_read_extra_data (chip, phy_blk,0 , - extra,MS_EXTRA_SIZE ); + extra,MS_EXTRA_SIZE );if (retval !=STATUS_SUCCESS ) {dev_dbg (rtsx_dev (chip),"read extra data fail\n" );ms_set_bad_block (chip, phy_blk);
@@ -2685,7 +2691,7 @@ static int ms_build_l2p_tbl(struct rtsx_chip *chip, int seg_no) }if ((log_blk < ms_start_idx[seg_no]) || - (log_blk >= ms_start_idx[seg_no +1 ])) { + (log_blk >= ms_start_idx[seg_no +1 ])) {if (!(chip->card_wp &MS_CARD )) { retval =ms_erase_block (chip, phy_blk);if (retval !=STATUS_SUCCESS )
@@ -2705,7 +2711,7 @@ static int ms_build_l2p_tbl(struct rtsx_chip *chip, int seg_no) us1 = extra[0 ] &0x10 ; tmp_blk = segment->l2p_table[idx]; retval =ms_read_extra_data (chip, tmp_blk,0 , - extra,MS_EXTRA_SIZE ); + extra,MS_EXTRA_SIZE );if (retval !=STATUS_SUCCESS )continue ; us2 = extra[0 ] &0x10 ;
@@ -2774,7 +2780,8 @@ static int ms_build_l2p_tbl(struct rtsx_chip *chip, int seg_no) phy_blk =ms_get_unused_block (chip,0 ); retval =ms_copy_page (chip, tmp_blk, phy_blk, - log_blk,0 , ms_card->page_off +1 ); + log_blk,0 , + ms_card->page_off +1 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -2861,7 +2868,7 @@ int reset_ms_card(struct rtsx_chip *chip) }static int mspro_set_rw_cmd (struct rtsx_chip *chip, -u32 start_sec,u16 sec_cnt,u8 cmd) +u32 start_sec,u16 sec_cnt,u8 cmd) {int retval, i;u8 data[8 ];
@@ -2932,8 +2939,8 @@ static inline int ms_auto_tune_clock(struct rtsx_chip *chip) }static int mspro_rw_multi_sector (struct scsi_cmnd *srb, -struct rtsx_chip *chip,u32 start_sector, -u16 sector_cnt) +struct rtsx_chip *chip,u32 start_sector, +u16 sector_cnt) {struct ms_info *ms_card = &chip->ms_card;bool mode_2k = false;
@@ -3038,8 +3045,8 @@ static int mspro_rw_multi_sector(struct scsi_cmnd *srb, } retval =ms_transfer_data (chip, trans_mode, rw_tpc, sector_cnt, -WAIT_INT , mode_2k,scsi_sg_count (srb), -scsi_sglist (srb),scsi_bufflen (srb)); +WAIT_INT , mode_2k,scsi_sg_count (srb), +scsi_sglist (srb),scsi_bufflen (srb));if (retval !=STATUS_SUCCESS ) { ms_card->seq_mode =0 ;rtsx_read_register (chip,MS_TRANS_CFG , &val);
@@ -3076,7 +3083,7 @@ static int mspro_rw_multi_sector(struct scsi_cmnd *srb, }static int mspro_read_format_progress (struct rtsx_chip *chip, -const int short_data_len) +const int short_data_len) {struct ms_info *ms_card = &chip->ms_card;int retval, i;
@@ -3117,7 +3124,7 @@ static int mspro_read_format_progress(struct rtsx_chip *chip, cnt = (u8 )short_data_len; retval =rtsx_write_register (chip,MS_CFG ,MS_NO_CHECK_INT , -MS_NO_CHECK_INT ); +MS_NO_CHECK_INT );if (retval !=STATUS_SUCCESS ) { ms_card->format_status =FORMAT_FAIL ;rtsx_trace (chip);
@@ -3125,7 +3132,7 @@ static int mspro_read_format_progress(struct rtsx_chip *chip, } retval =ms_read_bytes (chip,PRO_READ_SHORT_DATA , cnt,WAIT_INT , - data,8 ); + data,8 );if (retval !=STATUS_SUCCESS ) { ms_card->format_status =FORMAT_FAIL ;rtsx_trace (chip);
@@ -3204,7 +3211,7 @@ void mspro_polling_format_status(struct rtsx_chip *chip)int i;if (ms_card->pro_under_formatting && - (rtsx_get_stat (chip) !=RTSX_STAT_SS )) { + (rtsx_get_stat (chip) !=RTSX_STAT_SS )) {rtsx_set_stat (chip,RTSX_STAT_RUN );for (i =0 ; i <65535 ; i++) {
@@ -3216,7 +3223,7 @@ void mspro_polling_format_status(struct rtsx_chip *chip) }int mspro_format (struct scsi_cmnd *srb,struct rtsx_chip *chip, -int short_data_len,bool quick_format) +int short_data_len,bool quick_format) {struct ms_info *ms_card = &chip->ms_card;int retval, i;
@@ -3305,9 +3312,9 @@ int mspro_format(struct scsi_cmnd *srb, struct rtsx_chip *chip, }static int ms_read_multiple_pages (struct rtsx_chip *chip,u16 phy_blk, -u16 log_blk,u8 start_page,u8 end_page, -u8 *buf,unsigned int *index, -unsigned int *offset) +u16 log_blk,u8 start_page,u8 end_page, +u8 *buf,unsigned int *index, +unsigned int *offset) {struct ms_info *ms_card = &chip->ms_card;int retval, i;
@@ -3315,7 +3322,7 @@ static int ms_read_multiple_pages(struct rtsx_chip *chip, u16 phy_blk,u8 *ptr; retval =ms_read_extra_data (chip, phy_blk, start_page, - extra,MS_EXTRA_SIZE ); + extra,MS_EXTRA_SIZE );if (retval ==STATUS_SUCCESS ) {if ((extra[1 ] &0x30 ) !=0x30 ) {ms_set_err_code (chip,MS_FLASH_READ_ERROR );
@@ -3325,7 +3332,7 @@ 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 ); + SystemParm,6 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -3420,7 +3427,7 @@ 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 ); + &val,1 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -3441,23 +3448,24 @@ static int ms_read_multiple_pages(struct rtsx_chip *chip, u16 phy_blk,rtsx_add_cmd (chip,WRITE_REG_CMD ,MS_TPC ,0xFF ,READ_PAGE_DATA );rtsx_add_cmd (chip,WRITE_REG_CMD ,MS_TRANS_CFG , -0xFF , trans_cfg); +0xFF , trans_cfg);rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_DATA_SOURCE , -0x01 ,RING_BUFFER ); +0x01 ,RING_BUFFER );trans_dma_enable (DMA_FROM_DEVICE , chip,512 ,DMA_512 );rtsx_add_cmd (chip,WRITE_REG_CMD ,MS_TRANSFER ,0xFF , -MS_TRANSFER_START |MS_TM_NORMAL_READ ); +MS_TRANSFER_START |MS_TM_NORMAL_READ );rtsx_add_cmd (chip,CHECK_REG_CMD ,MS_TRANSFER , -MS_TRANSFER_END ,MS_TRANSFER_END ); +MS_TRANSFER_END ,MS_TRANSFER_END );rtsx_send_cmd_no_wait (chip); - retval =rtsx_transfer_data_partial (chip,MS_CARD , ptr, -512 ,scsi_sg_count (chip->srb), - index, offset,DMA_FROM_DEVICE , - chip->ms_timeout); + retval =rtsx_transfer_data_partial (chip,MS_CARD , ptr,512 , +scsi_sg_count (chip->srb), + index, offset, +DMA_FROM_DEVICE , + chip->ms_timeout);if (retval <0 ) {if (retval == -ETIMEDOUT ) {ms_set_err_code (chip,MS_TO_ERROR );
@@ -3489,7 +3497,7 @@ static int ms_read_multiple_pages(struct rtsx_chip *chip, u16 phy_blk, }static int ms_write_multiple_pages (struct rtsx_chip *chip,u16 old_blk, -u16 new_blk,u16 log_blk,u8 start_page, +u16 new_blk,u16 log_blk,u8 start_page,u8 end_page,u8 *buf,unsigned int *index,unsigned int *offset) {
@@ -3500,7 +3508,7 @@ 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 ); + SystemParm,7 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -3534,7 +3542,7 @@ static int ms_write_multiple_pages(struct rtsx_chip *chip, u16 old_blk,ms_set_err_code (chip,MS_NO_ERROR ); retval =ms_transfer_tpc (chip,MS_TM_READ_BYTES ,GET_INT ,1 , -NO_WAIT_INT ); +NO_WAIT_INT );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -3542,7 +3550,7 @@ static int ms_write_multiple_pages(struct rtsx_chip *chip, u16 old_blk, } retval =ms_set_rw_reg_addr (chip, OverwriteFlag,MS_EXTRA_SIZE , - SystemParm, (6 +MS_EXTRA_SIZE )); + SystemParm, (6 +MS_EXTRA_SIZE ));if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -3630,25 +3638,26 @@ static int ms_write_multiple_pages(struct rtsx_chip *chip, u16 old_blk,rtsx_init_cmd (chip);rtsx_add_cmd (chip,WRITE_REG_CMD ,MS_TPC , -0xFF ,WRITE_PAGE_DATA ); +0xFF ,WRITE_PAGE_DATA );rtsx_add_cmd (chip,WRITE_REG_CMD ,MS_TRANS_CFG , -0xFF ,WAIT_INT ); +0xFF ,WAIT_INT );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_DATA_SOURCE , -0x01 ,RING_BUFFER ); +0x01 ,RING_BUFFER );trans_dma_enable (DMA_TO_DEVICE , chip,512 ,DMA_512 );rtsx_add_cmd (chip,WRITE_REG_CMD ,MS_TRANSFER ,0xFF , -MS_TRANSFER_START |MS_TM_NORMAL_WRITE ); +MS_TRANSFER_START |MS_TM_NORMAL_WRITE );rtsx_add_cmd (chip,CHECK_REG_CMD ,MS_TRANSFER , -MS_TRANSFER_END ,MS_TRANSFER_END ); +MS_TRANSFER_END ,MS_TRANSFER_END );rtsx_send_cmd_no_wait (chip); - retval =rtsx_transfer_data_partial (chip,MS_CARD , ptr, -512 ,scsi_sg_count (chip->srb), - index, offset,DMA_TO_DEVICE , - chip->ms_timeout); + retval =rtsx_transfer_data_partial (chip,MS_CARD , ptr,512 , +scsi_sg_count (chip->srb), + index, offset, +DMA_TO_DEVICE , + chip->ms_timeout);if (retval <0 ) {ms_set_err_code (chip,MS_TO_ERROR );rtsx_clear_ms_error (chip);
@@ -3677,7 +3686,7 @@ static int ms_write_multiple_pages(struct rtsx_chip *chip, u16 old_blk,if (page_addr == (end_page -1 )) {if (!(val &INT_REG_CED )) { retval =ms_send_cmd (chip,BLOCK_END , -WAIT_INT ); +WAIT_INT );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -3685,7 +3694,7 @@ static int ms_write_multiple_pages(struct rtsx_chip *chip, u16 old_blk, } retval =ms_read_bytes (chip,GET_INT ,1 , -NO_WAIT_INT , &val,1 ); +NO_WAIT_INT , &val,1 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -3693,7 +3702,7 @@ static int ms_write_multiple_pages(struct rtsx_chip *chip, u16 old_blk, }if ((page_addr == (end_page -1 )) || - (page_addr == ms_card->page_off)) { + (page_addr == ms_card->page_off)) {if (!(val &INT_REG_CED )) {ms_set_err_code (chip,MS_FLASH_WRITE_ERROR );
@@ -3711,13 +3720,13 @@ static int ms_write_multiple_pages(struct rtsx_chip *chip, u16 old_blk, }static int ms_finish_write (struct rtsx_chip *chip,u16 old_blk,u16 new_blk, -u16 log_blk,u8 page_off) +u16 log_blk,u8 page_off) {struct ms_info *ms_card = &chip->ms_card;int retval, seg_no; retval =ms_copy_page (chip, old_blk, new_blk, log_blk, - page_off, ms_card->page_off +1 ); + page_off, ms_card->page_off +1 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -3740,13 +3749,13 @@ static int ms_finish_write(struct rtsx_chip *chip, u16 old_blk, u16 new_blk, }static int ms_prepare_write (struct rtsx_chip *chip,u16 old_blk,u16 new_blk, -u16 log_blk,u8 start_page) +u16 log_blk,u8 start_page) {int retval;if (start_page) { retval =ms_copy_page (chip, old_blk, new_blk, log_blk, -0 , start_page); +0 , start_page);if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip);return STATUS_FAIL ;
@@ -3772,7 +3781,7 @@ int ms_delay_write(struct rtsx_chip *chip) delay_write->delay_write_flag =0 ; retval =ms_finish_write (chip, - delay_write->old_phyblock, + delay_write->old_phyblock, delay_write->new_phyblock, delay_write->logblock, delay_write->pageoff);
@@ -3790,13 +3799,13 @@ static inline void ms_rw_fail(struct scsi_cmnd *srb, struct rtsx_chip *chip) {if (srb->sc_data_direction ==DMA_FROM_DEVICE )set_sense_type (chip,SCSI_LUN (srb), -SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR ); +SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR );else set_sense_type (chip,SCSI_LUN (srb),SENSE_TYPE_MEDIA_WRITE_ERR ); }static int ms_rw_multi_sector (struct scsi_cmnd *srb,struct rtsx_chip *chip, -u32 start_sector,u16 sector_cnt) +u32 start_sector,u16 sector_cnt) {struct ms_info *ms_card = &chip->ms_card;unsigned int lun =SCSI_LUN (srb);
@@ -3843,16 +3852,17 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *chip,if (srb->sc_data_direction ==DMA_TO_DEVICE ) {#ifdef MS_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 ; retval =ms_copy_page (chip, - delay_write->old_phyblock, - delay_write->new_phyblock, log_blk, - delay_write->pageoff, start_page); + delay_write->old_phyblock, + delay_write->new_phyblock, + log_blk, + 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 ; }
@@ -3868,7 +3878,7 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *chip, retval =ms_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 ; }
@@ -3878,13 +3888,13 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *chip, new_blk =ms_get_unused_block (chip, seg_no);if ((old_blk ==0xFFFF ) || (new_blk ==0xFFFF )) {set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_WRITE_ERR ); +SENSE_TYPE_MEDIA_WRITE_ERR );rtsx_trace (chip);return STATUS_FAIL ; } retval =ms_prepare_write (chip, old_blk, new_blk, - log_blk, start_page); + log_blk, start_page);if (retval !=STATUS_SUCCESS ) {if (detect_card_cd (chip,MS_CARD ) !=STATUS_SUCCESS ) { set_sense_type(chip, lun,
@@ -3893,7 +3903,7 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *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 ; }
@@ -3906,21 +3916,21 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *chip,if (retval !=STATUS_SUCCESS ) {if (detect_card_cd (chip,MS_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 ; }#endif old_blk =ms_get_l2p_tbl (chip, seg_no, - log_blk - ms_start_idx[seg_no]); + log_blk - ms_start_idx[seg_no]);if (old_blk ==0xFFFF ) {set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR ); +SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR );rtsx_trace (chip);return STATUS_FAIL ; }
@@ -3942,19 +3952,21 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *chip,if (srb->sc_data_direction ==DMA_FROM_DEVICE ) { retval =ms_read_multiple_pages (chip, - old_blk, log_blk, start_page, end_page, - ptr, &index, &offset); + old_blk, log_blk, + start_page, end_page, + ptr, &index, &offset); }else { - retval =ms_write_multiple_pages (chip, old_blk, - new_blk, log_blk, start_page, end_page, - ptr, &index, &offset); + retval =ms_write_multiple_pages (chip, old_blk, new_blk, + log_blk, start_page, + end_page, ptr, &index, + &offset); }if (retval !=STATUS_SUCCESS ) {toggle_gpio (chip,1 );if (detect_card_cd (chip,MS_CARD ) !=STATUS_SUCCESS ) {set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_NOT_PRESENT ); +SENSE_TYPE_MEDIA_NOT_PRESENT );rtsx_trace (chip);return STATUS_FAIL ; }
@@ -3970,8 +3982,8 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *chip,ms_set_unused_block (chip, old_blk);ms_set_l2p_tbl (chip, seg_no, - log_blk - ms_start_idx[seg_no], - new_blk); + log_blk - ms_start_idx[seg_no], + new_blk); } }
@@ -3995,14 +4007,14 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *chip,if (retval !=STATUS_SUCCESS ) { chip->card_fail |=MS_CARD ;set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_NOT_PRESENT ); +SENSE_TYPE_MEDIA_NOT_PRESENT );rtsx_trace (chip);return STATUS_FAIL ; } } old_blk =ms_get_l2p_tbl (chip, seg_no, - log_blk - ms_start_idx[seg_no]); + log_blk - ms_start_idx[seg_no]);if (old_blk ==0xFFFF ) {ms_rw_fail (srb, chip);rtsx_trace (chip);
@@ -4034,7 +4046,7 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *chip, delay_write->pageoff = end_page;#else retval =ms_finish_write (chip, old_blk, new_blk, - log_blk, end_page); + log_blk, end_page);if (retval !=STATUS_SUCCESS ) {if (detect_card_cd (chip,MS_CARD ) !=STATUS_SUCCESS ) { set_sense_type(chip, lun,
@@ -4057,17 +4069,17 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *chip, }int ms_rw (struct scsi_cmnd *srb,struct rtsx_chip *chip, -u32 start_sector,u16 sector_cnt) +u32 start_sector,u16 sector_cnt) {struct ms_info *ms_card = &chip->ms_card;int retval;if (CHK_MSPRO (ms_card)) retval =mspro_rw_multi_sector (srb, chip, start_sector, - sector_cnt); + sector_cnt);else retval =ms_rw_multi_sector (srb, chip, start_sector, - sector_cnt); + sector_cnt);return retval; }
@@ -4189,7 +4201,7 @@ static int mg_send_ex_cmd(struct rtsx_chip *chip, u8 cmd, u8 entry_num) }static int mg_set_tpc_para_sub (struct rtsx_chip *chip,int type, -u8 mg_entry_num) +u8 mg_entry_num) {int retval;u8 buf[6 ];
@@ -4306,7 +4318,7 @@ int mg_get_local_EKB(struct scsi_cmnd *srb, struct rtsx_chip *chip) } retval =ms_transfer_data (chip,MS_TM_AUTO_READ ,PRO_READ_LONG_DATA , -3 ,WAIT_INT ,0 ,0 , buf +4 ,1536 ); +3 ,WAIT_INT ,0 ,0 , buf +4 ,1536 );if (retval !=STATUS_SUCCESS ) {set_sense_type (chip, lun,SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN );rtsx_clear_ms_error (chip);
@@ -4354,7 +4366,7 @@ int mg_chg(struct scsi_cmnd *srb, struct rtsx_chip *chip) } retval =ms_read_bytes (chip,PRO_READ_SHORT_DATA ,32 ,WAIT_INT , - buf,32 ); + buf,32 );if (retval !=STATUS_SUCCESS ) {set_sense_type (chip, lun,SENSE_TYPE_MG_INCOMPATIBLE_MEDIUM );rtsx_trace (chip);
@@ -4437,7 +4449,7 @@ int mg_get_rsp_chg(struct scsi_cmnd *srb, struct rtsx_chip *chip) } retval =ms_read_bytes (chip,PRO_READ_SHORT_DATA ,32 ,WAIT_INT , - buf1,32 ); + buf1,32 );if (retval !=STATUS_SUCCESS ) {set_sense_type (chip, lun,SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN );rtsx_trace (chip);
@@ -4560,7 +4572,7 @@ int mg_get_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip) } retval =ms_transfer_data (chip,MS_TM_AUTO_READ ,PRO_READ_LONG_DATA , -2 ,WAIT_INT ,0 ,0 , buf +4 ,1024 ); +2 ,WAIT_INT ,0 ,0 , buf +4 ,1024 );if (retval !=STATUS_SUCCESS ) {set_sense_type (chip, lun,SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR );rtsx_clear_ms_error (chip);
@@ -4619,7 +4631,7 @@ int mg_set_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip) SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB); elseset_sense_type (chip ,lun , -SENSE_TYPE_MG_WRITE_ERR ); +SENSE_TYPE_MG_WRITE_ERR ); }else {set_sense_type (chip, lun,SENSE_TYPE_MG_WRITE_ERR ); }
@@ -4634,17 +4646,17 @@ int mg_set_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip)rtsx_init_cmd (chip);rtsx_add_cmd (chip,WRITE_REG_CMD ,MS_TPC , -0xFF ,PRO_WRITE_LONG_DATA ); +0xFF ,PRO_WRITE_LONG_DATA );rtsx_add_cmd (chip,WRITE_REG_CMD ,MS_TRANS_CFG ,0xFF ,WAIT_INT );rtsx_add_cmd (chip,WRITE_REG_CMD ,CARD_DATA_SOURCE , -0x01 ,RING_BUFFER ); +0x01 ,RING_BUFFER );trans_dma_enable (DMA_TO_DEVICE , chip,512 ,DMA_512 );rtsx_add_cmd (chip,WRITE_REG_CMD ,MS_TRANSFER ,0xFF , -MS_TRANSFER_START |MS_TM_NORMAL_WRITE ); +MS_TRANSFER_START |MS_TM_NORMAL_WRITE );rtsx_add_cmd (chip,CHECK_REG_CMD ,MS_TRANSFER , -MS_TRANSFER_END ,MS_TRANSFER_END ); +MS_TRANSFER_END ,MS_TRANSFER_END );rtsx_send_cmd_no_wait (chip);
@@ -4657,10 +4669,10 @@ int mg_set_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip)set_sense_type (chip, lun,SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB ); elseset_sense_type (chip ,lun , -SENSE_TYPE_MG_WRITE_ERR ); +SENSE_TYPE_MG_WRITE_ERR ); }else {set_sense_type (chip, lun, -SENSE_TYPE_MG_WRITE_ERR ); +SENSE_TYPE_MG_WRITE_ERR ); } retval =STATUS_FAIL ;rtsx_trace (chip);
@@ -4669,7 +4681,7 @@ int mg_set_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip) }#else retval =ms_transfer_data (chip,MS_TM_AUTO_WRITE ,PRO_WRITE_LONG_DATA , -2 ,WAIT_INT ,0 ,0 , buf +4 ,1024 ); +2 ,WAIT_INT ,0 ,0 , buf +4 ,1024 );if ((retval !=STATUS_SUCCESS ) ||check_ms_err (chip)) {rtsx_clear_ms_error (chip);if (ms_card->mg_auth ==0 ) {
@@ -4678,7 +4690,7 @@ int mg_set_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip) SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB); elseset_sense_type (chip ,lun , -SENSE_TYPE_MG_WRITE_ERR ); +SENSE_TYPE_MG_WRITE_ERR ); }else {set_sense_type (chip, lun,SENSE_TYPE_MG_WRITE_ERR ); }
@@ -4706,7 +4718,7 @@ void ms_cleanup_work(struct rtsx_chip *chip) }if (CHK_MSHG (ms_card)) {rtsx_write_register (chip,MS_CFG , -MS_2K_SECTOR_MODE ,0x00 ); +MS_2K_SECTOR_MODE ,0x00 ); } }#ifdef MS_DELAY_WRITE
Signature · 1 line
2.1.4
PATCH 38/45 staging: rts5208: ms.c: Long Lines
In reply to Wayne PorterFix long lines detected by checkpatch
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/ms.c | 94 +++++++++++++++++++++++++++++--------------- 1 file changed, 63 insertions(+), 31 deletions(-)
drivers/staging/rts5208/ms.c +63 -31
@@ -432,31 +432,36 @@ static int ms_pull_ctl_disable(struct rtsx_chip *chip)if (CHECK_PID (chip,0x5208 )) { retval =rtsx_write_register (chip,CARD_PULL_CTL1 ,0xFF , -MS_D1_PD |MS_D2_PD |MS_CLK_PD |MS_D6_PD ); +MS_D1_PD |MS_D2_PD |MS_CLK_PD | +MS_D6_PD );if (retval) {rtsx_trace (chip);return retval; } retval =rtsx_write_register (chip,CARD_PULL_CTL2 ,0xFF , -MS_D3_PD |MS_D0_PD |MS_BS_PD |XD_D4_PD ); +MS_D3_PD |MS_D0_PD |MS_BS_PD | +XD_D4_PD );if (retval) {rtsx_trace (chip);return retval; } retval =rtsx_write_register (chip,CARD_PULL_CTL3 ,0xFF , -MS_D7_PD |XD_CE_PD |XD_CLE_PD |XD_CD_PU ); +MS_D7_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 |SD_D3_PD |SD_D2_PD |XD_ALE_PD ); +XD_RDY_PD |SD_D3_PD |SD_D2_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;
@@ -616,14 +621,20 @@ static int ms_prepare_reset(struct rtsx_chip *chip)if (chip->asic_code) { retval =rtsx_write_register (chip,MS_CFG ,0xFF , -SAMPLE_TIME_RISING |PUSH_TIME_DEFAULT |NO_EXTEND_TOGGLE |MS_BUS_WIDTH_1 ); +SAMPLE_TIME_RISING | +PUSH_TIME_DEFAULT | +NO_EXTEND_TOGGLE | +MS_BUS_WIDTH_1 );if (retval) {rtsx_trace (chip);return retval; } }else { retval =rtsx_write_register (chip,MS_CFG ,0xFF , -SAMPLE_TIME_FALLING |PUSH_TIME_DEFAULT |NO_EXTEND_TOGGLE |MS_BUS_WIDTH_1 ); +SAMPLE_TIME_FALLING | +PUSH_TIME_DEFAULT | +NO_EXTEND_TOGGLE | +MS_BUS_WIDTH_1 );if (retval) {rtsx_trace (chip);return retval;
@@ -2375,7 +2386,9 @@ static int reset_ms(struct rtsx_chip *chip) retval =rtsx_write_register (chip,MS_CFG ,0x58 |MS_NO_CHECK_INT , -MS_BUS_WIDTH_4 |PUSH_TIME_ODD |MS_NO_CHECK_INT ); +MS_BUS_WIDTH_4 | +PUSH_TIME_ODD | +MS_NO_CHECK_INT );if (retval) {rtsx_trace (chip);return retval;
@@ -2999,12 +3012,13 @@ static int mspro_rw_multi_sector(struct scsi_cmnd *srb, }if (ms_card->seq_mode) { -if ((ms_card->pre_dir != srb->sc_data_direction) - || ((ms_card->pre_sec_addr + ms_card->pre_sec_cnt) != start_sector) - || (mode_2k && (ms_card->seq_mode &MODE_512_SEQ )) - || (!mode_2k && (ms_card->seq_mode &MODE_2K_SEQ )) - || !(val &MS_INT_BREQ ) - || ((ms_card->total_sec_cnt + sector_cnt) >0xFE00 )) { +if ((ms_card->pre_dir != srb->sc_data_direction) || + ((ms_card->pre_sec_addr + ms_card->pre_sec_cnt) != + start_sector) || + (mode_2k && (ms_card->seq_mode &MODE_512_SEQ )) || + (!mode_2k && (ms_card->seq_mode &MODE_2K_SEQ )) || + !(val &MS_INT_BREQ ) || + ((ms_card->total_sec_cnt + sector_cnt) >0xFE00 )) { ms_card->seq_mode =0 ; ms_card->total_sec_cnt =0 ;if (val &MS_INT_BREQ ) {
@@ -3014,7 +3028,8 @@ static int mspro_rw_multi_sector(struct scsi_cmnd *srb,return STATUS_FAIL ; } -rtsx_write_register (chip,RBCTL ,RB_FLUSH ,RB_FLUSH ); +rtsx_write_register (chip,RBCTL ,RB_FLUSH , +RB_FLUSH ); } } }
@@ -3109,7 +3124,8 @@ static int mspro_read_format_progress(struct rtsx_chip *chip, }if (!(tmp &MS_INT_BREQ )) { -if ((tmp & (MS_INT_CED |MS_INT_BREQ |MS_INT_CMDNK |MS_INT_ERR )) ==MS_INT_CED ) { +if ((tmp & (MS_INT_CED |MS_INT_BREQ |MS_INT_CMDNK | +MS_INT_ERR )) ==MS_INT_CED ) { ms_card->format_status =FORMAT_SUCCESS ;return STATUS_SUCCESS ; }
@@ -3396,11 +3412,17 @@ static int ms_read_multiple_pages(struct rtsx_chip *chip, u16 phy_blk,if (retval !=STATUS_SUCCESS ) {if (!(chip->card_wp &MS_CARD )) {reset_ms (chip); -ms_set_page_status (log_blk, setPS_NG, extra,MS_EXTRA_SIZE ); -ms_write_extra_data (chip, phy_blk, - page_addr, extra,MS_EXTRA_SIZE ); +ms_set_page_status + (log_blk, setPS_NG, + extra, +MS_EXTRA_SIZE ); +ms_write_extra_data + (chip, phy_blk, + page_addr, extra, +MS_EXTRA_SIZE ); } -ms_set_err_code (chip,MS_FLASH_READ_ERROR ); +ms_set_err_code (chip, +MS_FLASH_READ_ERROR );rtsx_trace (chip);return STATUS_FAIL ; }
@@ -3883,8 +3905,9 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *chip,return STATUS_FAIL ; }#endif - old_blk =ms_get_l2p_tbl (chip, seg_no, - log_blk - ms_start_idx[seg_no]); + old_blk =ms_get_l2p_tbl + (chip, seg_no, + log_blk - ms_start_idx[seg_no]); new_blk =ms_get_unused_block (chip, seg_no);if ((old_blk ==0xFFFF ) || (new_blk ==0xFFFF )) { set_sense_type(chip, lun,
@@ -3896,8 +3919,10 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *chip, retval =ms_prepare_write (chip, old_blk, new_blk, log_blk, start_page);if (retval !=STATUS_SUCCESS ) { -if (detect_card_cd (chip,MS_CARD ) !=STATUS_SUCCESS ) { -set_sense_type (chip, lun, +if (detect_card_cd (chip,MS_CARD ) != +STATUS_SUCCESS ) { +set_sense_type + (chip, lun,SENSE_TYPE_MEDIA_NOT_PRESENT );rtsx_trace (chip);return STATUS_FAIL ;
@@ -4048,8 +4073,10 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *chip, retval =ms_finish_write (chip, old_blk, new_blk, log_blk, end_page);if (retval !=STATUS_SUCCESS ) { -if (detect_card_cd (chip,MS_CARD ) !=STATUS_SUCCESS ) { -set_sense_type (chip, lun, +if (detect_card_cd (chip,MS_CARD ) != +STATUS_SUCCESS ) { +set_sense_type + (chip, lun,SENSE_TYPE_MEDIA_NOT_PRESENT );rtsx_trace (chip);return STATUS_FAIL ;
@@ -4627,7 +4654,8 @@ int mg_set_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (retval !=STATUS_SUCCESS ) {if (ms_card->mg_auth ==0 ) {if ((buf[5 ] &0xC0 ) !=0 ) -set_sense_type (chip, lun, +set_sense_type + (chip, lun,SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB );else set_sense_type(chip, lun,
@@ -4666,7 +4694,9 @@ int mg_set_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip)rtsx_clear_ms_error (chip);if (ms_card->mg_auth ==0 ) {if ((buf[5 ] &0xC0 ) !=0 ) -set_sense_type (chip, lun,SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB ); +set_sense_type + (chip, lun, +SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB );else set_sense_type (chip, lun,SENSE_TYPE_MG_WRITE_ERR );
@@ -4686,8 +4716,9 @@ int mg_set_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip)rtsx_clear_ms_error (chip);if (ms_card->mg_auth ==0 ) {if ((buf[5 ] &0xC0 ) !=0 ) -set_sense_type (chip, lun, -SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB ); +set_sense_type + (chip, lun, +SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB );else set_sense_type (chip, lun,SENSE_TYPE_MG_WRITE_ERR );
@@ -4722,7 +4753,8 @@ void ms_cleanup_work(struct rtsx_chip *chip) } }#ifdef MS_DELAY_WRITE - else if ((!CHK_MSPRO(ms_card)) && ms_card->delay_write.delay_write_flag) { + else if ((!CHK_MSPRO(ms_card)) && + ms_card->delay_write.delay_write_flag) {dev_dbg (rtsx_dev (chip),"MS: delay write\n" );ms_delay_write (chip); ms_card->cleanup_counter =0 ;
Signature · 1 line
2.1.4
PATCH 39/45 staging: rts5208: ms.c: Multiple assignments
In reply to Wayne PorterFix check found by checkpatch
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/ms.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/rts5208/ms.c +2 -1
@@ -2646,7 +2646,8 @@ static int ms_build_l2p_tbl(struct rtsx_chip *chip, int seg_no) disable_cnt = segment->disable_count; - segment->get_index = segment->set_index =0 ; + segment->get_index =0 ; + segment->set_index =0 ; segment->unused_blk_cnt =0 ;for (phy_blk = start; phy_blk < end; phy_blk++) {
Signature · 1 line
2.1.4
PATCH 40/45 staging: rts5208: ms.c: Braces fix
In reply to Wayne PorterAdd braces to all arms of if statement
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/ms.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rts5208/ms.c +2 -2
@@ -805,9 +805,9 @@ static int ms_confirm_cpu_startup(struct rtsx_chip *chip) }if (val &INT_REG_ERR ) { -if (val &INT_REG_CMDNK ) +if (val &INT_REG_CMDNK ) { chip->card_wp |= (MS_CARD ); -else { + }else {rtsx_trace (chip);return STATUS_FAIL ; }
Signature · 1 line
2.1.4
PATCH 41/45 staging: rts5208: CamelCase fix
In reply to Wayne PorterChange label to not use camel case per checkpatch
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/ms.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rts5208/ms.c +2 -2
@@ -1328,7 +1328,7 @@ static int reset_ms_pro(struct rtsx_chip *chip)#endif #ifdef XC_POWERCLASS -Retry: +retry:#endif retval =ms_pro_reset_flow (chip,1 );if (retval !=STATUS_SUCCESS ) {
@@ -1379,7 +1379,7 @@ static int reset_ms_pro(struct rtsx_chip *chip) change_power_class);if (retval !=STATUS_SUCCESS ) { change_power_class--; - goto Retry; + goto retry; } } }
Signature · 1 line
2.1.4
PATCH 42/45 staging: rts5208: rtsx_scsi.h: Long lines
In reply to Wayne PorterAligning with parenthesis causes lines to go too long, so the parenthesis are on a new line
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/rtsx_scsi.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/staging/rts5208/rtsx_scsi.c +6 -4
@@ -973,8 +973,9 @@ static int read_write(struct scsi_cmnd *srb, struct rtsx_chip *chip) }else { chip->rw_fail_cnt[lun]++;if (srb->sc_data_direction ==DMA_FROM_DEVICE ) -set_sense_type (chip, lun, -SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR ); +set_sense_type + (chip, lun, +SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR );else set_sense_type (chip, lun,SENSE_TYPE_MEDIA_WRITE_ERR );
@@ -1981,8 +1982,9 @@ static int read_phy_register(struct scsi_cmnd *srb, struct rtsx_chip *chip) retval =rtsx_read_phy_register (chip, addr + i, &val);if (retval !=STATUS_SUCCESS ) {vfree (buf); -set_sense_type (chip,SCSI_LUN (srb), -SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR ); +set_sense_type + (chip,SCSI_LUN (srb), +SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR );rtsx_trace (chip);return TRANSPORT_FAILED ; }
Signature · 1 line
2.1.4
PATCH 43/45 staging: rts5208: rtxs_chip.h: Long lines
In reply to Wayne PorterMove comments above long definitions so they don't go over 80 characters
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/rtsx_chip.h | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
drivers/staging/rts5208/rtsx_chip.h +10 -6
@@ -130,16 +130,20 @@#define PRDCT_REV_LEN 4/* Product LOT Length */ /* Dynamic flag definitions: used in set_bit() etc. */ -#define RTSX_FLIDX_TRANS_ACTIVE 18/* 0x00040000 transfer is active */ -#define RTSX_FLIDX_ABORTING 20/* 0x00100000 abort is in progress */ -#define RTSX_FLIDX_DISCONNECTING 21/* 0x00200000 disconnect in progress */ +/* 0x00040000 transfer is active */ +#define RTSX_FLIDX_TRANS_ACTIVE 18 +/* 0x00100000 abort is in progress */ +#define RTSX_FLIDX_ABORTING 20 +/* 0x00200000 disconnect in progress */ +#define RTSX_FLIDX_DISCONNECTING 21#define ABORTING_OR_DISCONNECTING ((1UL << US_FLIDX_ABORTING) | \ (1UL << US_FLIDX_DISCONNECTING)) -#define RTSX_FLIDX_RESETTING 22/* 0x00400000 device reset in progress */ -#define RTSX_FLIDX_TIMED_OUT 23/* 0x00800000 SCSI midlayer timed out */ - +/* 0x00400000 device reset in progress */ +#define RTSX_FLIDX_RESETTING 22 +/* 0x00800000 SCSI midlayer timed out */ +#define RTSX_FLIDX_TIMED_OUT 23#define DRCT_ACCESS_DEV 0x00/* Direct Access Device */ #define RMB_DISC 0x80/* The Device is Removable */ #define ANSI_SCSI2 0x02/* Based on ANSI-SCSI2 */
Signature · 1 line
2.1.4
PATCH 44/45 staging: rts5208: rtsx_chip.c: Long lines
In reply to Wayne PorterFix lines that go over 80 characters to stop warnings from checkpatch
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/rtsx_chip.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
drivers/staging/rts5208/rtsx_chip.c +10 -7
@@ -114,7 +114,8 @@ static int rtsx_pre_handle_sdio_old(struct rtsx_chip *chip)if (chip->asic_code) { retval =rtsx_write_register (chip,CARD_PULL_CTL5 ,0xFF , -MS_INS_PU |SD_WP_PU |SD_CD_PU |SD_CMD_PU ); +MS_INS_PU |SD_WP_PU | +SD_CD_PU |SD_CMD_PU );if (retval) {rtsx_trace (chip);return retval;
@@ -240,10 +241,10 @@ static int rtsx_pre_handle_sdio_new(struct rtsx_chip *chip)return STATUS_FAIL ; } }else { - retval =rtsx_write_register (chip, -FPGA_PULL_CTL , -FPGA_SD_PULL_CTL_BIT |0x20 , -0 ); + retval =rtsx_write_register + (chip,FPGA_PULL_CTL , +FPGA_SD_PULL_CTL_BIT |0x20 , +0 );if (retval) {rtsx_trace (chip);return retval;
@@ -713,7 +714,8 @@ int rtsx_reset_chip(struct rtsx_chip *chip)if (chip->ft2_fast_mode) { retval =rtsx_write_register (chip,CARD_PWR_CTL ,0xFF , -MS_PARTIAL_POWER_ON |SD_PARTIAL_POWER_ON ); +MS_PARTIAL_POWER_ON | +SD_PARTIAL_POWER_ON );if (retval) {rtsx_trace (chip);return retval;
@@ -1567,7 +1569,8 @@ int rtsx_write_cfg_dw(struct rtsx_chip *chip, u8 func_no, u16 addr, u32 mask, } retval =rtsx_write_register (chip,CFGRWCTL ,0xFF , -0x80 | mode | ((func_no &0x03 ) <<4 )); +0x80 | mode | + ((func_no &0x03 ) <<4 ));if (retval) {rtsx_trace (chip);return retval;
Signature · 1 line
2.1.4
PATCH 45/45 staging: rts5208: rtsx.c: Alignment fix
In reply to Wayne PorterLine goes too long when aligned with parenthesis, so moved to a new line
Signed-off-by Wayne Porter <[email protected]>
--- drivers/staging/rts5208/rtsx.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/staging/rts5208/rtsx.c +4 -3
@@ -728,9 +728,10 @@ static int rtsx_scan_thread(void *__dev)dev_info (&dev->pci->dev,"%s: waiting for device to settle before scanning\n" ,CR_DRIVER_NAME ); -wait_event_interruptible_timeout (dev->delay_wait, -rtsx_chk_stat (chip,RTSX_STAT_DISCONNECT ), - delay_use *HZ ); +wait_event_interruptible_timeout + (dev->delay_wait, +rtsx_chk_stat (chip,RTSX_STAT_DISCONNECT ), + delay_use *HZ ); }/* If the device is still connected, perform the scanning */
Signature · 1 line
2.1.4