Staging: rts5208: rtsx_scsi.c: Fixed all braces issues of the file
PATCH 3/4 Staging: rts5208: rtsx_scsi.c: Fixed all braces issues of the file
Fixed all the braces issues of the rtsx_scsi.c file
Signed-off-by Maxime Desroches <[email protected]>
--- drivers/staging/rts5208/rtsx_scsi.c | 108 ++++++++++------------------ 1 file changed, 36 insertions(+), 72 deletions(-)
drivers/staging/rts5208/rtsx_scsi.c +36 -72
@@ -507,9 +507,8 @@ static int inquiry(struct scsi_cmnd *srb, struct rtsx_chip *chip) } buf =vmalloc (scsi_bufflen (srb)); -if (!buf) { +if (!buf)return TRANSPORT_ERROR ; - }#ifdef SUPPORT_MAGIC_GATE if ((chip->mspro_formatter_enable) &&
@@ -637,9 +636,8 @@ static int request_sense(struct scsi_cmnd *srb, struct rtsx_chip *chip) } buf =vmalloc (scsi_bufflen (srb)); -if (!buf) { +if (!buf)return TRANSPORT_ERROR ; - } tmp = (unsigned char *)sense;memcpy (buf, tmp,scsi_bufflen (srb));
@@ -783,9 +781,8 @@ static int mode_sense(struct scsi_cmnd *srb, struct rtsx_chip *chip)#endif buf =kmalloc (data_size,GFP_KERNEL ); -if (!buf) { +if (!buf)return TRANSPORT_ERROR ; - } page_code = srb->cmnd[2 ] &0x3f ;
@@ -999,9 +996,8 @@ static int read_format_capacity(struct scsi_cmnd *srb, struct rtsx_chip *chip) buf_len = (scsi_bufflen (srb) >12 ) ?0x14 :12 ; buf =kmalloc (buf_len,GFP_KERNEL ); -if (!buf) { +if (!buf)return TRANSPORT_ERROR ; - } buf[i++] =0 ; buf[i++] =0 ;
@@ -1076,9 +1072,8 @@ static int read_capacity(struct scsi_cmnd *srb, struct rtsx_chip *chip) } buf =kmalloc (8 ,GFP_KERNEL ); -if (!buf) { +if (!buf)return TRANSPORT_ERROR ; - } card_size =get_card_size (chip, lun); buf[0 ] = (unsigned char )((card_size -1 ) >>24 );
@@ -1116,9 +1111,8 @@ static int read_eeprom(struct scsi_cmnd *srb, struct rtsx_chip *chip) len = ((u16 )srb->cmnd[4 ] <<8 ) | srb->cmnd[5 ]; buf =vmalloc (len); -if (!buf) { +if (!buf)return TRANSPORT_ERROR ; - } retval =rtsx_force_power_on (chip,SSC_PDCTL );if (retval !=STATUS_SUCCESS ) {
@@ -1180,9 +1174,8 @@ static int write_eeprom(struct scsi_cmnd *srb, struct rtsx_chip *chip) len = (unsigned short)min_t(unsigned int, scsi_bufflen(srb), len); buf =vmalloc (len); -if (!buf) { +if (!buf)return TRANSPORT_ERROR ; - }rtsx_stor_get_xfer_buf (buf, len, srb);scsi_set_resid (srb,scsi_bufflen (srb) - len);
@@ -1227,9 +1220,8 @@ static int read_mem(struct scsi_cmnd *srb, struct rtsx_chip *chip) } buf =vmalloc (len); -if (!buf) { +if (!buf)return TRANSPORT_ERROR ; - } retval =rtsx_force_power_on (chip,SSC_PDCTL );if (retval !=STATUS_SUCCESS ) {
@@ -1282,9 +1274,8 @@ static int write_mem(struct scsi_cmnd *srb, struct rtsx_chip *chip) len = (unsigned short)min_t(unsigned int, scsi_bufflen(srb), len); buf =vmalloc (len); -if (!buf) { +if (!buf)return TRANSPORT_ERROR ; - }rtsx_stor_get_xfer_buf (buf, len, srb);scsi_set_resid (srb,scsi_bufflen (srb) - len);
@@ -1702,41 +1693,35 @@ static int set_chip_mode(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (phy_debug_mode) { chip->phy_debug_mode =1 ; retval =rtsx_write_register (chip,CDRESUMECTL ,0x77 ,0 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return TRANSPORT_FAILED ; - }rtsx_disable_bus_int (chip); retval =rtsx_read_phy_register (chip,0x1C , ®); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return TRANSPORT_FAILED ; - } reg |=0x0001 ; retval =rtsx_write_phy_register (chip,0x1C , reg); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return TRANSPORT_FAILED ; - } }else { chip->phy_debug_mode =0 ; retval =rtsx_write_register (chip,CDRESUMECTL ,0x77 ,0x77 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return TRANSPORT_FAILED ; - }rtsx_enable_bus_int (chip); retval =rtsx_read_phy_register (chip,0x1C , ®); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return TRANSPORT_FAILED ; - } reg &=0xFFFE ; retval =rtsx_write_phy_register (chip,0x1C , reg); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return TRANSPORT_FAILED ; - } }return TRANSPORT_GOOD ;
@@ -1840,9 +1825,8 @@ static int read_phy_register(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (len) { buf =vmalloc (len); -if (!buf) { +if (!buf)return TRANSPORT_ERROR ; - } retval =rtsx_force_power_on (chip,SSC_PDCTL );if (retval !=STATUS_SUCCESS ) {
@@ -1903,9 +1887,8 @@ static int write_phy_register(struct scsi_cmnd *srb, struct rtsx_chip *chip) len); buf =vmalloc (len); -if (!buf) { +if (!buf)return TRANSPORT_ERROR ; - }rtsx_stor_get_xfer_buf (buf, len, srb);scsi_set_resid (srb,scsi_bufflen (srb) - len);
@@ -1999,9 +1982,8 @@ static int read_eeprom2(struct scsi_cmnd *srb, struct rtsx_chip *chip) len = ((u16 )srb->cmnd[6 ] <<8 ) | srb->cmnd[7 ]; buf =vmalloc (len); -if (!buf) { +if (!buf)return TRANSPORT_ERROR ; - } retval =rtsx_force_power_on (chip,SSC_PDCTL );if (retval !=STATUS_SUCCESS ) {
@@ -2049,9 +2031,8 @@ static int write_eeprom2(struct scsi_cmnd *srb, struct rtsx_chip *chip) len = (unsigned short)min_t(unsigned int, scsi_bufflen(srb), len); buf =vmalloc (len); -if (!buf) { +if (!buf)return TRANSPORT_ERROR ; - }rtsx_stor_get_xfer_buf (buf, len, srb);scsi_set_resid (srb,scsi_bufflen (srb) - len);
@@ -2096,9 +2077,8 @@ static int read_efuse(struct scsi_cmnd *srb, struct rtsx_chip *chip) len = srb->cmnd[5 ]; buf =vmalloc (len); -if (!buf) { +if (!buf)return TRANSPORT_ERROR ; - } retval =rtsx_force_power_on (chip,SSC_PDCTL );if (retval !=STATUS_SUCCESS ) {
@@ -2147,9 +2127,8 @@ static int write_efuse(struct scsi_cmnd *srb, struct rtsx_chip *chip) len = (u8)min_t(unsigned int, scsi_bufflen(srb), len); buf =vmalloc (len); -if (!buf) { +if (!buf)return TRANSPORT_ERROR ; - }rtsx_stor_get_xfer_buf (buf, len, srb);scsi_set_resid (srb,scsi_bufflen (srb) - len);
@@ -2215,29 +2194,25 @@ static int write_efuse(struct scsi_cmnd *srb, struct rtsx_chip *chip)vfree (buf); retval =card_power_off (chip,SPI_CARD ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return TRANSPORT_ERROR ; - }if (chip->asic_code) { retval =rtsx_write_register (chip,PWR_GATE_CTRL ,LDO3318_PWR_MASK ,LDO_OFF ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return TRANSPORT_ERROR ; - }wait_timeout (600 ); retval =rtsx_write_phy_register (chip,0x08 , val); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return TRANSPORT_ERROR ; - } retval =rtsx_write_register (chip,PWR_GATE_CTRL ,LDO3318_PWR_MASK ,LDO_ON ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return TRANSPORT_ERROR ; - } }return result;
@@ -2278,9 +2253,8 @@ static int read_cfg_byte(struct scsi_cmnd *srb, struct rtsx_chip *chip) } buf =vmalloc (len); -if (!buf) { +if (!buf)return TRANSPORT_ERROR ; - } retval =rtsx_read_cfg_seq (chip, func, addr, buf, len);if (retval !=STATUS_SUCCESS ) {
@@ -2335,9 +2309,8 @@ static int write_cfg_byte(struct scsi_cmnd *srb, struct rtsx_chip *chip) len = (unsigned short)min_t(unsigned int, scsi_bufflen(srb), len); buf =vmalloc (len); -if (!buf) { +if (!buf)return TRANSPORT_ERROR ; - }rtsx_stor_get_xfer_buf (buf, len, srb);scsi_set_resid (srb,scsi_bufflen (srb) - len);
@@ -2657,9 +2630,8 @@ static int spi_vendor_cmd(struct scsi_cmnd *srb, struct rtsx_chip *chip)rtsx_write_register (chip,CARD_GPIO_DIR ,0x07 , gpio_dir); -if (result !=STATUS_SUCCESS ) { +if (result !=STATUS_SUCCESS )return TRANSPORT_FAILED ; - }return TRANSPORT_GOOD ; }
@@ -2849,9 +2821,8 @@ static int get_ms_information(struct scsi_cmnd *srb, struct rtsx_chip *chip) } buf =kmalloc (buf_len,GFP_KERNEL ); -if (!buf) { +if (!buf)return TRANSPORT_ERROR ; - } i =0 ;/* GET Memory Stick Media Information Response Header */
@@ -3025,9 +2996,8 @@ static int mg_report_key(struct scsi_cmnd *srb, struct rtsx_chip *chip) (srb->cmnd[8] == 0x04) && (srb->cmnd[9] == 0x1C)) { retval = mg_get_local_EKB(srb, chip); - if (retval != STATUS_SUCCESS) { + if (retval != STATUS_SUCCESS) return TRANSPORT_FAILED; - } } else { set_sense_type(chip, lun,
@@ -3041,9 +3011,8 @@ static int mg_report_key(struct scsi_cmnd *srb, struct rtsx_chip *chip) (srb->cmnd[8] == 0x00) && (srb->cmnd[9] == 0x24)) { retval = mg_get_rsp_chg(srb, chip); - if (retval != STATUS_SUCCESS) { + if (retval != STATUS_SUCCESS) return TRANSPORT_FAILED; - } } else { set_sense_type(chip, lun,
@@ -3062,9 +3031,8 @@ static int mg_report_key(struct scsi_cmnd *srb, struct rtsx_chip *chip) (srb->cmnd[4] == 0x00) && (srb->cmnd[5] < 32)) { retval = mg_get_ICV(srb, chip); - if (retval != STATUS_SUCCESS) { + if (retval != STATUS_SUCCESS) return TRANSPORT_FAILED; - } } else { set_sense_type(chip, lun,
@@ -3131,9 +3099,8 @@ static int mg_send_key(struct scsi_cmnd *srb, struct rtsx_chip *chip) (srb->cmnd[8] == 0x00) && (srb->cmnd[9] == 0x0C)) { retval = mg_set_leaf_id(srb, chip); - if (retval != STATUS_SUCCESS) { + if (retval != STATUS_SUCCESS) return TRANSPORT_FAILED; - } } else { set_sense_type(chip, lun,
@@ -3147,9 +3114,8 @@ static int mg_send_key(struct scsi_cmnd *srb, struct rtsx_chip *chip) (srb->cmnd[8] == 0x00) && (srb->cmnd[9] == 0x0C)) { retval = mg_chg(srb, chip); - if (retval != STATUS_SUCCESS) { + if (retval != STATUS_SUCCESS) return TRANSPORT_FAILED; - } } else { set_sense_type(chip, lun,
@@ -3163,9 +3129,8 @@ static int mg_send_key(struct scsi_cmnd *srb, struct rtsx_chip *chip) (srb->cmnd[8] == 0x00) && (srb->cmnd[9] == 0x0C)) { retval = mg_rsp(srb, chip); - if (retval != STATUS_SUCCESS) { + if (retval != STATUS_SUCCESS) return TRANSPORT_FAILED; - } } else { set_sense_type(chip, lun,
@@ -3184,9 +3149,8 @@ static int mg_send_key(struct scsi_cmnd *srb, struct rtsx_chip *chip) (srb->cmnd[4] == 0x00) && (srb->cmnd[5] < 32)) { retval = mg_set_ICV(srb, chip); - if (retval != STATUS_SUCCESS) { + if (retval != STATUS_SUCCESS) return TRANSPORT_FAILED; - } } else { set_sense_type(chip, lun,
Signature · 1 line
2.17.1