[PATCH 6/6] Staging: rts5208: xd.c: Fixed all braces issues of the file

2018-10-02 Thread Maxime Desroches 
Fixed all the braces issues of the xd.c file

Signed-off-by: Maxime Desroches 
---
 drivers/staging/rts5208/xd.c | 232 ++-
 1 file changed, 92 insertions(+), 140 deletions(-)

diff --git a/drivers/staging/rts5208/xd.c b/drivers/staging/rts5208/xd.c
index 261d868a3072..415fea2f9ff1 100644
--- a/drivers/staging/rts5208/xd.c
+++ b/drivers/staging/rts5208/xd.c
@@ -60,9 +60,8 @@ static int xd_set_init_para(struct rtsx_chip *chip)
xd_card->xd_clock = CLK_50;
 
retval = switch_clock(chip, xd_card->xd_clock);
-   if (retval != STATUS_SUCCESS) {
+   if (retval != STATUS_SUCCESS)
return STATUS_FAIL;
-   }
 
return STATUS_SUCCESS;
 }
@@ -73,14 +72,12 @@ static int xd_switch_clock(struct rtsx_chip *chip)
int retval;
 
retval = select_card(chip, XD_CARD);
-   if (retval != STATUS_SUCCESS) {
+   if (retval != STATUS_SUCCESS)
return STATUS_FAIL;
-   }
 
retval = switch_clock(chip, xd_card->xd_clock);
-   if (retval != STATUS_SUCCESS) {
+   if (retval != STATUS_SUCCESS)
return STATUS_FAIL;
-   }
 
return STATUS_SUCCESS;
 }
@@ -102,9 +99,8 @@ static int xd_read_id(struct rtsx_chip *chip, u8 id_cmd, u8 
*id_buf, u8 buf_len)
rtsx_add_cmd(chip, READ_REG_CMD, (u16)(XD_ADDRESS1 + i), 0, 0);
 
retval = rtsx_send_cmd(chip, XD_CARD, 20);
-   if (retval < 0) {
+   if (retval < 0)
return STATUS_FAIL;
-   }
 
ptr = rtsx_get_cmd_data(chip) + 1;
if (id_buf && buf_len) {
@@ -173,9 +169,8 @@ static int xd_read_redundant(struct rtsx_chip *chip, u32 
page_addr,
rtsx_add_cmd(chip, READ_REG_CMD, XD_PARITY, 0, 0);
 
retval = rtsx_send_cmd(chip, XD_CARD, 500);
-   if (retval < 0) {
+   if (retval < 0)
return STATUS_FAIL;
-   }
 
if (buf && buf_len) {
u8 *ptr = rtsx_get_cmd_data(chip) + 1;
@@ -193,9 +188,8 @@ static int xd_read_data_from_ppb(struct rtsx_chip *chip, 
int offset,
 {
int retval, i;
 
-   if (!buf || (buf_len < 0)) {
+   if (!buf || (buf_len < 0))
return STATUS_FAIL;
-   }
 
rtsx_init_cmd(chip);
 
@@ -220,9 +214,8 @@ static int xd_read_cis(struct rtsx_chip *chip, u32 
page_addr, u8 *buf,
int retval;
u8 reg;
 
-   if (!buf || (buf_len < 10)) {
+   if (!buf || (buf_len < 10))
return STATUS_FAIL;
-   }
 
rtsx_init_cmd(chip);
 
@@ -246,36 +239,35 @@ static int xd_read_cis(struct rtsx_chip *chip, u32 
page_addr, u8 *buf,
}
 
retval = rtsx_read_register(chip, XD_PAGE_STATUS, );
-   if (retval) {
+   if (retval)
return retval;
-   }
+
if (reg != XD_GPG) {
rtsx_clear_xd_error(chip);
return STATUS_FAIL;
}
 
retval = rtsx_read_register(chip, XD_CTL, );
-   if (retval) {
+   if (retval)
return retval;
-   }
+
if (!(reg & XD_ECC1_ERROR) || !(reg & XD_ECC1_UNCORRECTABLE)) {
retval = xd_read_data_from_ppb(chip, 0, buf, buf_len);
-   if (retval != STATUS_SUCCESS) {
+   if (retval != STATUS_SUCCESS)
return STATUS_FAIL;
-   }
+
if (reg & XD_ECC1_ERROR) {
u8 ecc_bit, ecc_byte;
 
retval = rtsx_read_register(chip, XD_ECC_BIT1,
_bit);
-   if (retval) {
+   if (retval)
return retval;
-   }
+
retval = rtsx_read_register(chip, XD_ECC_BYTE1,
_byte);
-   if (retval) {
+   if (retval)
return retval;
-   }
 
dev_dbg(rtsx_dev(chip), "ECC_BIT1 = 0x%x, ECC_BYTE1 = 
0x%x\n",
ecc_bit, ecc_byte);
@@ -291,22 +283,21 @@ static int xd_read_cis(struct rtsx_chip *chip, u32 
page_addr, u8 *buf,
rtsx_clear_xd_error(chip);
 
retval = xd_read_data_from_ppb(chip, 256, buf, buf_len);
-   if (retval != STATUS_SUCCESS) {
+   if (retval != STATUS_SUCCESS)
return STATUS_FAIL;
-   }
+
if (reg & XD_ECC2_ERROR) {
u8 ecc_bit, ecc_byte;
 
retval = rtsx_read_register(chip, XD_ECC_BIT2,
_bit);
-   if (retval) {
+   if (retval)
return retval;
-   }
+
retval = rtsx_read_register(chip, XD_ECC_BYTE2,

Re: [PATCH 6/6] Staging: rts5208: xd.c: Fixed all braces issues of the file

2018-10-02 Thread Greg KH 
On Sat, Sep 29, 2018 at 02:00:27PM -0400, Maxime Desroches wrote:
> Fixed all the braces issues of the xd.c file
> 
> Signed-off-by: Maxime Desroches 
> ---
>  drivers/staging/rts5208/xd.c | 232 ++-
>  1 file changed, 92 insertions(+), 140 deletions(-)

Again, missing earlier patches.

Please fix this up and resend as a proper series of patches, properly
numbered.

thanks,

greg k-h
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH 6/6] Staging: rts5208: xd.c: Fixed all braces issues of the file

2018-09-29 Thread Maxime Desroches 
Fixed all the braces issues of the xd.c file

Signed-off-by: Maxime Desroches 
---
 drivers/staging/rts5208/xd.c | 232 ++-
 1 file changed, 92 insertions(+), 140 deletions(-)

diff --git a/drivers/staging/rts5208/xd.c b/drivers/staging/rts5208/xd.c
index 261d868a3072..415fea2f9ff1 100644
--- a/drivers/staging/rts5208/xd.c
+++ b/drivers/staging/rts5208/xd.c
@@ -60,9 +60,8 @@ static int xd_set_init_para(struct rtsx_chip *chip)
xd_card->xd_clock = CLK_50;
 
retval = switch_clock(chip, xd_card->xd_clock);
-   if (retval != STATUS_SUCCESS) {
+   if (retval != STATUS_SUCCESS)
return STATUS_FAIL;
-   }
 
return STATUS_SUCCESS;
 }
@@ -73,14 +72,12 @@ static int xd_switch_clock(struct rtsx_chip *chip)
int retval;
 
retval = select_card(chip, XD_CARD);
-   if (retval != STATUS_SUCCESS) {
+   if (retval != STATUS_SUCCESS)
return STATUS_FAIL;
-   }
 
retval = switch_clock(chip, xd_card->xd_clock);
-   if (retval != STATUS_SUCCESS) {
+   if (retval != STATUS_SUCCESS)
return STATUS_FAIL;
-   }
 
return STATUS_SUCCESS;
 }
@@ -102,9 +99,8 @@ static int xd_read_id(struct rtsx_chip *chip, u8 id_cmd, u8 
*id_buf, u8 buf_len)
rtsx_add_cmd(chip, READ_REG_CMD, (u16)(XD_ADDRESS1 + i), 0, 0);
 
retval = rtsx_send_cmd(chip, XD_CARD, 20);
-   if (retval < 0) {
+   if (retval < 0)
return STATUS_FAIL;
-   }
 
ptr = rtsx_get_cmd_data(chip) + 1;
if (id_buf && buf_len) {
@@ -173,9 +169,8 @@ static int xd_read_redundant(struct rtsx_chip *chip, u32 
page_addr,
rtsx_add_cmd(chip, READ_REG_CMD, XD_PARITY, 0, 0);
 
retval = rtsx_send_cmd(chip, XD_CARD, 500);
-   if (retval < 0) {
+   if (retval < 0)
return STATUS_FAIL;
-   }
 
if (buf && buf_len) {
u8 *ptr = rtsx_get_cmd_data(chip) + 1;
@@ -193,9 +188,8 @@ static int xd_read_data_from_ppb(struct rtsx_chip *chip, 
int offset,
 {
int retval, i;
 
-   if (!buf || (buf_len < 0)) {
+   if (!buf || (buf_len < 0))
return STATUS_FAIL;
-   }
 
rtsx_init_cmd(chip);
 
@@ -220,9 +214,8 @@ static int xd_read_cis(struct rtsx_chip *chip, u32 
page_addr, u8 *buf,
int retval;
u8 reg;
 
-   if (!buf || (buf_len < 10)) {
+   if (!buf || (buf_len < 10))
return STATUS_FAIL;
-   }
 
rtsx_init_cmd(chip);
 
@@ -246,36 +239,35 @@ static int xd_read_cis(struct rtsx_chip *chip, u32 
page_addr, u8 *buf,
}
 
retval = rtsx_read_register(chip, XD_PAGE_STATUS, );
-   if (retval) {
+   if (retval)
return retval;
-   }
+
if (reg != XD_GPG) {
rtsx_clear_xd_error(chip);
return STATUS_FAIL;
}
 
retval = rtsx_read_register(chip, XD_CTL, );
-   if (retval) {
+   if (retval)
return retval;
-   }
+
if (!(reg & XD_ECC1_ERROR) || !(reg & XD_ECC1_UNCORRECTABLE)) {
retval = xd_read_data_from_ppb(chip, 0, buf, buf_len);
-   if (retval != STATUS_SUCCESS) {
+   if (retval != STATUS_SUCCESS)
return STATUS_FAIL;
-   }
+
if (reg & XD_ECC1_ERROR) {
u8 ecc_bit, ecc_byte;
 
retval = rtsx_read_register(chip, XD_ECC_BIT1,
_bit);
-   if (retval) {
+   if (retval)
return retval;
-   }
+
retval = rtsx_read_register(chip, XD_ECC_BYTE1,
_byte);
-   if (retval) {
+   if (retval)
return retval;
-   }
 
dev_dbg(rtsx_dev(chip), "ECC_BIT1 = 0x%x, ECC_BYTE1 = 
0x%x\n",
ecc_bit, ecc_byte);
@@ -291,22 +283,21 @@ static int xd_read_cis(struct rtsx_chip *chip, u32 
page_addr, u8 *buf,
rtsx_clear_xd_error(chip);
 
retval = xd_read_data_from_ppb(chip, 256, buf, buf_len);
-   if (retval != STATUS_SUCCESS) {
+   if (retval != STATUS_SUCCESS)
return STATUS_FAIL;
-   }
+
if (reg & XD_ECC2_ERROR) {
u8 ecc_bit, ecc_byte;
 
retval = rtsx_read_register(chip, XD_ECC_BIT2,
_bit);
-   if (retval) {
+   if (retval)
return retval;
-   }
+
retval = rtsx_read_register(chip, XD_ECC_BYTE2,