Staging: rts5208: spi.c: Fixed all braces issues of the file
PATCH 5/5 Staging: rts5208: spi.c: Fixed all braces issues of the file
Fixed all the braces issues of the spi.c file
Signed-off-by Maxime Desroches <[email protected]>
--- drivers/staging/rts5208/spi.c | 153 +++++++++++++--------------------- 1 file changed, 59 insertions(+), 94 deletions(-)
drivers/staging/rts5208/spi.c +59 -94
@@ -41,14 +41,13 @@ static int spi_init(struct rtsx_chip *chip) retval =rtsx_write_register (chip,SPI_CONTROL ,0xFF ,CS_POLARITY_LOW |DTO_MSB_FIRST |SPI_MASTER |SPI_MODE0 |SPI_AUTO ); -if (retval) { +if (retval)return retval; - } + retval =rtsx_write_register (chip,SPI_TCTL ,EDO_TIMING_MASK ,SAMPLE_DELAY_HALF ); -if (retval) { +if (retval)return retval; - }return STATUS_SUCCESS ; }
@@ -60,42 +59,37 @@ static int spi_set_init_para(struct rtsx_chip *chip) retval =rtsx_write_register (chip,SPI_CLK_DIVIDER1 ,0xFF , (u8)(spi->clk_div >>8 )); -if (retval) { +if (retval)return retval; - } + retval =rtsx_write_register (chip,SPI_CLK_DIVIDER0 ,0xFF , (u8)(spi->clk_div)); -if (retval) { +if (retval)return retval; - } retval =switch_clock (chip, spi->spi_clock); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =select_card (chip,SPI_CARD ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =rtsx_write_register (chip,CARD_CLK_EN ,SPI_CLK_EN ,SPI_CLK_EN ); -if (retval) { +if (retval)return retval; - } + retval =rtsx_write_register (chip,CARD_OE ,SPI_OUTPUT_EN ,SPI_OUTPUT_EN ); -if (retval) { +if (retval)return retval; - }wait_timeout (10 ); retval =spi_init (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }return STATUS_SUCCESS ; }
@@ -247,47 +241,45 @@ static int spi_init_eeprom(struct rtsx_chip *chip) clk =CLK_30 ; retval =rtsx_write_register (chip,SPI_CLK_DIVIDER1 ,0xFF ,0x00 ); -if (retval) { +if (retval)return retval; - } + retval =rtsx_write_register (chip,SPI_CLK_DIVIDER0 ,0xFF ,0x27 ); -if (retval) { +if (retval)return retval; - } retval =switch_clock (chip, clk); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } + retval =select_card (chip,SPI_CARD ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } + retval =rtsx_write_register (chip,CARD_CLK_EN ,SPI_CLK_EN ,SPI_CLK_EN ); -if (retval) { +if (retval)return retval; - } + retval =rtsx_write_register (chip,CARD_OE ,SPI_OUTPUT_EN ,SPI_OUTPUT_EN ); -if (retval) { +if (retval)return retval; - } +wait_timeout (10 ); retval =rtsx_write_register (chip,SPI_CONTROL ,0xFF ,CS_POLARITY_HIGH |SPI_EEPROM_AUTO ); -if (retval) { +if (retval)return retval; - } + retval =rtsx_write_register (chip,SPI_TCTL ,EDO_TIMING_MASK ,SAMPLE_DELAY_HALF ); -if (retval) { +if (retval)return retval; - }return STATUS_SUCCESS ; }
@@ -306,9 +298,8 @@ static int spi_eeprom_program_enable(struct rtsx_chip *chip) SPI_TRANSFER0_END); retval =rtsx_send_cmd (chip,0 ,100 ); -if (retval <0 ) { +if (retval <0 )return STATUS_FAIL ; - }return STATUS_SUCCESS ; }
@@ -318,14 +309,12 @@ int spi_erase_eeprom_chip(struct rtsx_chip *chip)int retval; retval =spi_init_eeprom (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =spi_eeprom_program_enable (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }rtsx_init_cmd (chip);
@@ -339,14 +328,12 @@ int spi_erase_eeprom_chip(struct rtsx_chip *chip) SPI_TRANSFER0_END); retval =rtsx_send_cmd (chip,0 ,100 ); -if (retval <0 ) { +if (retval <0 )return STATUS_FAIL ; - } retval =rtsx_write_register (chip,CARD_GPIO_DIR ,0x01 ,0x01 ); -if (retval) { +if (retval)return retval; - }return STATUS_SUCCESS ; }
@@ -356,14 +343,12 @@ int spi_erase_eeprom_byte(struct rtsx_chip *chip, u16 addr)int retval; retval =spi_init_eeprom (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =spi_eeprom_program_enable (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }rtsx_init_cmd (chip);
@@ -379,14 +364,12 @@ int spi_erase_eeprom_byte(struct rtsx_chip *chip, u16 addr) SPI_TRANSFER0_END); retval =rtsx_send_cmd (chip,0 ,100 ); -if (retval <0 ) { +if (retval <0 )return STATUS_FAIL ; - } retval =rtsx_write_register (chip,CARD_GPIO_DIR ,0x01 ,0x01 ); -if (retval) { +if (retval)return retval; - }return STATUS_SUCCESS ; }
@@ -397,9 +380,8 @@ int spi_read_eeprom(struct rtsx_chip *chip, u16 addr, u8 *val)u8 data; retval =spi_init_eeprom (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }rtsx_init_cmd (chip);
@@ -416,23 +398,20 @@ int spi_read_eeprom(struct rtsx_chip *chip, u16 addr, u8 *val) SPI_TRANSFER0_END); retval =rtsx_send_cmd (chip,0 ,100 ); -if (retval <0 ) { +if (retval <0 )return STATUS_FAIL ; - }wait_timeout (5 ); retval =rtsx_read_register (chip,SPI_DATA , &data); -if (retval) { +if (retval)return retval; - }if (val) *val = data; retval =rtsx_write_register (chip,CARD_GPIO_DIR ,0x01 ,0x01 ); -if (retval) { +if (retval)return retval; - }return STATUS_SUCCESS ; }
@@ -442,14 +421,12 @@ int spi_write_eeprom(struct rtsx_chip *chip, u16 addr, u8 val)int retval; retval =spi_init_eeprom (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =spi_eeprom_program_enable (chip); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }rtsx_init_cmd (chip);
@@ -466,14 +443,12 @@ int spi_write_eeprom(struct rtsx_chip *chip, u16 addr, u8 val) SPI_TRANSFER0_END); retval =rtsx_send_cmd (chip,0 ,100 ); -if (retval <0 ) { +if (retval <0 )return STATUS_FAIL ; - } retval =rtsx_write_register (chip,CARD_GPIO_DIR ,0x01 ,0x01 ); -if (retval) { +if (retval)return retval; - }return STATUS_SUCCESS ; }
@@ -577,9 +552,8 @@ int spi_read_flash_id(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (len) { buf =kmalloc (len,GFP_KERNEL ); -if (!buf) { +if (!buf)return STATUS_ERROR ; - } retval =rtsx_read_ppbuf (chip, buf, len);if (retval !=STATUS_SUCCESS ) {
@@ -621,9 +595,8 @@ int spi_read_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip) } buf =kmalloc (SF_PAGE_LEN ,GFP_KERNEL ); -if (!buf) { +if (!buf)return STATUS_ERROR ; - }while (len) {u16 pagelen =SF_PAGE_LEN - (u8 )addr;
@@ -716,9 +689,8 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (program_mode ==BYTE_PROGRAM ) { buf =kmalloc (4 ,GFP_KERNEL ); -if (!buf) { +if (!buf)return STATUS_ERROR ; - }while (len) { retval =sf_enable_write (chip,SPI_WREN );
@@ -762,14 +734,12 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)int first_byte =1 ; retval =sf_enable_write (chip,SPI_WREN ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } buf =kmalloc (4 ,GFP_KERNEL ); -if (!buf) { +if (!buf)return STATUS_ERROR ; - }while (len) { rtsx_stor_access_xfer_buf(buf, 1, srb, &index, &offset,
@@ -808,19 +778,17 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)kfree (buf); retval =sf_disable_write (chip,SPI_WRDI ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =sf_polling_status (chip,100 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } + }else if (program_mode ==PAGE_PROGRAM ) { buf =kmalloc (SF_PAGE_LEN ,GFP_KERNEL ); -if (!buf) { +if (!buf)return STATUS_NOMEM ; - }while (len) {u16 pagelen =SF_PAGE_LEN - (u8 )addr;
@@ -893,24 +861,22 @@ int spi_erase_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)if (erase_mode ==PAGE_ERASE ) { retval =sf_enable_write (chip,SPI_WREN ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =sf_erase (chip, ins,1 , addr); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } + }else if (erase_mode ==CHIP_ERASE ) { retval =sf_enable_write (chip,SPI_WREN ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } retval =sf_erase (chip, ins,0 ,0 ); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - } + }else {spi_set_err_code (chip,SPI_INVALID_COMMAND );return STATUS_FAIL ;
@@ -935,9 +901,8 @@ int spi_write_flash_status(struct scsi_cmnd *srb, struct rtsx_chip *chip) } retval =sf_enable_write (chip, ewsr); -if (retval !=STATUS_SUCCESS ) { +if (retval !=STATUS_SUCCESS )return STATUS_FAIL ; - }rtsx_init_cmd (chip);
Signature · 1 line
2.17.1
Greg KH
maintainerQuoted 6 lines · Maxime Desroches
Fixed all the braces issues of the
spi.cfileSigned-off-by Maxime Desroches <[email protected]>--- drivers/staging/rts5208/spi.c | 153 +++++++++++++--------------------- 1 file changed, 59 insertions(+), 94 deletions(-)
where are patches 1-4 out of this 5 patch series?
thanks,
greg k-h