staging: rts5208: fix style warnings in xd.c

This patch fixes the following checkpatch.pl warning in xd.c:
WARNING: else is not generally useful after a break or return

It also makes code more uniform with the new changes

Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 14 insertions, 24 deletions

diff --git a/drivers/staging/rts5208/xd.c b/drivers/staging/rts5208/xd.c
index ff423fa4600b..1de02bb98839 100644
--- a/drivers/staging/rts5208/xd.c
+++ b/drivers/staging/rts5208/xd.c
@@ -1622,10 +1622,8 @@ static int xd_read_multiple_pages(struct rtsx_chip *chip, u32 phy_blk,
         u8 reg_val, page_cnt;
         int zone_no, retval, i;
 
-        if (start_page > end_page) {
-                rtsx_trace(chip);
-                return STATUS_FAIL;
-        }
+        if (start_page > end_page)
+                goto Status_Fail;
 
         page_cnt = end_page - start_page;
         zone_no = (int)(log_blk / 1000);
@@ -1641,8 +1639,7 @@ static int xd_read_multiple_pages(struct rtsx_chip *chip, u32 phy_blk,
 
                         if (detect_card_cd(chip, XD_CARD) != STATUS_SUCCESS) {
                                 xd_set_err_code(chip, XD_NO_CARD);
-                                rtsx_trace(chip);
-                                return STATUS_FAIL;
+                                goto Status_Fail;
                         }
                 }
         }
@@ -1677,8 +1674,7 @@ static int xd_read_multiple_pages(struct rtsx_chip *chip, u32 phy_blk,
 
                 if (retval == -ETIMEDOUT) {
                         xd_set_err_code(chip, XD_TO_ERROR);
-                        rtsx_trace(chip);
-                        return STATUS_FAIL;
+                        goto Status_Fail;
                 } else {
                         rtsx_trace(chip);
                         goto Fail;
@@ -1711,8 +1707,7 @@ Fail:
 
                 if (detect_card_cd(chip, XD_CARD) != STATUS_SUCCESS) {
                         xd_set_err_code(chip, XD_NO_CARD);
-                        rtsx_trace(chip);
-                        return STATUS_FAIL;
+                        goto Status_Fail;
                 }
 
                 xd_set_err_code(chip, XD_ECC_ERROR);
@@ -1720,8 +1715,7 @@ Fail:
                 new_blk = xd_get_unused_block(chip, zone_no);
                 if (new_blk == NO_NEW_BLK) {
                         XD_CLR_BAD_OLDBLK(xd_card);
-                        rtsx_trace(chip);
-                        return STATUS_FAIL;
+                        goto Status_Fail;
                 }
 
                 retval = xd_copy_page(chip, phy_blk, new_blk, 0,
@@ -1735,8 +1729,7 @@ Fail:
                                 XD_CLR_BAD_NEWBLK(xd_card);
                         }
                         XD_CLR_BAD_OLDBLK(xd_card);
-                        rtsx_trace(chip);
-                        return STATUS_FAIL;
+                        goto Status_Fail;
                 }
                 xd_set_l2p_tbl(chip, zone_no, log_off, (u16)(new_blk & 0x3FF));
                 xd_erase_block(chip, phy_blk);
@@ -1744,6 +1737,7 @@ Fail:
                 XD_CLR_BAD_OLDBLK(xd_card);
         }
 
+Status_Fail:
         rtsx_trace(chip);
         return STATUS_FAIL;
 }
@@ -1842,10 +1836,8 @@ static int xd_write_multiple_pages(struct rtsx_chip *chip, u32 old_blk,
         dev_dbg(rtsx_dev(chip), "%s, old_blk = 0x%x, new_blk = 0x%x, log_blk = 0x%x\n",
                 __func__, old_blk, new_blk, log_blk);
 
-        if (start_page > end_page) {
-                rtsx_trace(chip);
-                return STATUS_FAIL;
-        }
+        if (start_page > end_page)
+                goto Status_Fail;
 
         page_cnt = end_page - start_page;
         zone_no = (int)(log_blk / 1000);
@@ -1854,10 +1846,8 @@ static int xd_write_multiple_pages(struct rtsx_chip *chip, u32 old_blk,
         page_addr = (new_blk << xd_card->block_shift) + start_page;
 
         retval = xd_send_cmd(chip, READ1_1);
-        if (retval != STATUS_SUCCESS) {
-                rtsx_trace(chip);
-                return STATUS_FAIL;
-        }
+        if (retval != STATUS_SUCCESS)
+                goto Status_Fail;
 
         rtsx_init_cmd(chip);
 
@@ -1892,8 +1882,7 @@ static int xd_write_multiple_pages(struct rtsx_chip *chip, u32 old_blk,
 
                 if (retval == -ETIMEDOUT) {
                         xd_set_err_code(chip, XD_TO_ERROR);
-                        rtsx_trace(chip);
-                        return STATUS_FAIL;
+                        goto Status_Fail;
                 } else {
                         rtsx_trace(chip);
                         goto Fail;
@@ -1933,6 +1922,7 @@ Fail:
                 xd_mark_bad_block(chip, new_blk);
         }
 
+Status_Fail:
         rtsx_trace(chip);
         return STATUS_FAIL;
 }