lkml.org 
[lkml]   [2012]   [Sep]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 42/57] staging/rts_pstor: remove braces {} in sd.c (reset_sd_card)
    Date
    fixed below checkpatch warnings.
    -WARNING: braces {} are not necessary for single statement blocks

    Signed-off-by: Toshiaki Yamane <yamanetoshi@gmail.com>
    ---
    drivers/staging/rts_pstor/sd.c | 22 ++++++++--------------
    1 file changed, 8 insertions(+), 14 deletions(-)

    diff --git a/drivers/staging/rts_pstor/sd.c b/drivers/staging/rts_pstor/sd.c
    index c117dc4..f0b11a4 100644
    --- a/drivers/staging/rts_pstor/sd.c
    +++ b/drivers/staging/rts_pstor/sd.c
    @@ -2961,36 +2961,31 @@ int reset_sd_card(struct rtsx_chip *chip)
    chip->capacity[chip->card2lun[SD_CARD]] = 0;

    retval = enable_card_clock(chip, SD_CARD);
    - if (retval != STATUS_SUCCESS) {
    + if (retval != STATUS_SUCCESS)
    TRACE_RET(chip, STATUS_FAIL);
    - }

    if (chip->ignore_sd && CHK_SDIO_EXIST(chip) && !CHK_SDIO_IGNORED(chip)) {
    if (chip->asic_code) {
    retval = sd_pull_ctl_enable(chip);
    - if (retval != STATUS_SUCCESS) {
    + if (retval != STATUS_SUCCESS)
    TRACE_RET(chip, STATUS_FAIL);
    - }
    } else {
    retval = rtsx_write_register(chip, FPGA_PULL_CTL,
    FPGA_SD_PULL_CTL_BIT | 0x20, 0);
    - if (retval != STATUS_SUCCESS) {
    + if (retval != STATUS_SUCCESS)
    TRACE_RET(chip, STATUS_FAIL);
    - }
    }
    retval = card_share_mode(chip, SD_CARD);
    - if (retval != STATUS_SUCCESS) {
    + if (retval != STATUS_SUCCESS)
    TRACE_RET(chip, STATUS_FAIL);
    - }

    chip->sd_io = 1;
    TRACE_RET(chip, STATUS_FAIL);
    }

    retval = sd_init_power(chip);
    - if (retval != STATUS_SUCCESS) {
    + if (retval != STATUS_SUCCESS)
    TRACE_RET(chip, STATUS_FAIL);
    - }

    if (chip->sd_ctl & RESET_MMC_FIRST) {
    retval = reset_mmc(chip);
    @@ -3029,18 +3024,17 @@ int reset_sd_card(struct rtsx_chip *chip)
    }

    retval = sd_set_clock_divider(chip, SD_CLK_DIVIDE_0);
    - if (retval != STATUS_SUCCESS) {
    + if (retval != STATUS_SUCCESS)
    TRACE_RET(chip, STATUS_FAIL);
    - }
    +
    RTSX_WRITE_REG(chip, REG_SD_BYTE_CNT_L, 0xFF, 0);
    RTSX_WRITE_REG(chip, REG_SD_BYTE_CNT_H, 0xFF, 2);

    chip->capacity[chip->card2lun[SD_CARD]] = sd_card->capacity;

    retval = sd_set_init_para(chip);
    - if (retval != STATUS_SUCCESS) {
    + if (retval != STATUS_SUCCESS)
    TRACE_RET(chip, STATUS_FAIL);
    - }

    RTSX_DEBUGP("sd_card->sd_type = 0x%x\n", sd_card->sd_type);

    --
    1.7.9.5


    \
     
     \ /
      Last update: 2012-09-07 12:02    [W:4.070 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site