staging: rts5208: remove unnecessary parentheses in sd.c
authorBenjamin Philip <benjamin.philip495@gmail.com>
Tue, 21 Sep 2021 07:33:46 +0000 (13:03 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 21 Sep 2021 15:30:55 +0000 (17:30 +0200)
This commit removes unnecessary parentheses, that have been flagged
by checkpatch.pl in sd.c

Signed-off-by: Benjamin Philip <benjamin.philip495@gmail.com>
Link: https://lore.kernel.org/r/b96aa1a0d9b306566a54d4b4643c06c520877042.1632209460.git.benjamin.philip495@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rts5208/sd.c

index 25c31496757eecd8712602dbdf5d73948bdb1b69..71f04e317eff24693162868321dae8dd4dc9597c 100644 (file)
@@ -218,9 +218,9 @@ RTY_SEND_CMD:
                }
        }
 
-       if ((rsp_type == SD_RSP_TYPE_R1) || (rsp_type == SD_RSP_TYPE_R1b)) {
-               if ((cmd_idx != SEND_RELATIVE_ADDR) &&
-                   (cmd_idx != SEND_IF_COND)) {
+       if (rsp_type == SD_RSP_TYPE_R1 || rsp_type == SD_RSP_TYPE_R1b) {
+               if (cmd_idx != SEND_RELATIVE_ADDR &&
+                   cmd_idx != SEND_IF_COND) {
                        if (cmd_idx != STOP_TRANSMISSION) {
                                if (ptr[1] & 0x80)
                                        return STATUS_FAIL;
@@ -462,7 +462,7 @@ static int sd_check_csd(struct rtsx_chip *chip, char check_wp)
        if (CHK_MMC_SECTOR_MODE(sd_card)) {
                sd_card->capacity = 0;
        } else {
-               if ((!CHK_SD_HCXC(sd_card)) || (csd_ver == 0)) {
+               if ((!CHK_SD_HCXC(sd_card)) || csd_ver == 0) {
                        u8 blk_size, c_size_mult;
                        u16 c_size;
 
@@ -1077,7 +1077,7 @@ static int sd_query_switch_result(struct rtsx_chip *chip, u8 func_group,
        }
 
        /* Check 'Busy Status' */
-       if ((buf[DATA_STRUCTURE_VER_OFFSET] == 0x01) &&
+       if (buf[DATA_STRUCTURE_VER_OFFSET] == 0x01 &&
            ((buf[check_busy_offset] & switch_busy) == switch_busy)) {
                return STATUS_FAIL;
        }
@@ -1148,7 +1148,7 @@ static int sd_check_switch_mode(struct rtsx_chip *chip, u8 mode, u8 func_group,
 
                dev_dbg(rtsx_dev(chip), "Maximum current consumption: %dmA\n",
                        cc);
-               if ((cc == 0) || (cc > 800))
+               if (cc == 0 || cc > 800)
                        return STATUS_FAIL;
 
                retval = sd_query_switch_result(chip, func_group,
@@ -1156,7 +1156,7 @@ static int sd_check_switch_mode(struct rtsx_chip *chip, u8 mode, u8 func_group,
                if (retval != STATUS_SUCCESS)
                        return STATUS_FAIL;
 
-               if ((cc > 400) || (func_to_switch > CURRENT_LIMIT_400)) {
+               if (cc > 400 || func_to_switch > CURRENT_LIMIT_400) {
                        retval = rtsx_write_register(chip, OCPPARA2,
                                                     SD_OCP_THD_MASK,
                                                     chip->sd_800mA_ocp_thd);
@@ -1292,7 +1292,7 @@ static int sd_switch_function(struct rtsx_chip *chip, u8 bus_width)
 
 #ifdef SUPPORT_SD_LOCK
        if ((sd_card->sd_lock_status & SD_SDR_RST) &&
-           (func_to_switch == DDR50_SUPPORT) &&
+           func_to_switch == DDR50_SUPPORT &&
            (sd_card->func_group1_mask & SDR50_SUPPORT_MASK)) {
                func_to_switch = SDR50_SUPPORT;
                dev_dbg(rtsx_dev(chip), "Using SDR50 instead of DDR50 for SD Lock\n");
@@ -1664,8 +1664,8 @@ static u8 sd_search_final_phase(struct rtsx_chip *chip, u32 phase_map,
                path[idx].mid = path[idx].start + path[idx].len / 2;
        }
 
-       if ((path[0].start == 0) &&
-           (path[cont_path_cnt - 1].end == MAX_PHASE)) {
+       if (path[0].start == 0 &&
+           path[cont_path_cnt - 1].end == MAX_PHASE) {
                path[0].start = path[cont_path_cnt - 1].start - MAX_PHASE - 1;
                path[0].len += path[cont_path_cnt - 1].len;
                path[0].mid = path[0].start + path[0].len / 2;
@@ -1811,7 +1811,7 @@ static int sd_ddr_pre_tuning_tx(struct rtsx_chip *chip)
                retval = sd_send_cmd_get_rsp(chip, SEND_STATUS,
                                             sd_card->sd_addr, SD_RSP_TYPE_R1,
                                             NULL, 0);
-               if ((retval == STATUS_SUCCESS) ||
+               if (retval == STATUS_SUCCESS ||
                    !sd_check_err_code(chip, SD_RSP_TIMEOUT))
                        phase_map |= 1 << i;
        }
@@ -2269,7 +2269,7 @@ static int sd_check_wp_state(struct rtsx_chip *chip)
 
        sd_card_type = ((u16)buf[2] << 8) | buf[3];
        dev_dbg(rtsx_dev(chip), "sd_card_type = 0x%04x\n", sd_card_type);
-       if ((sd_card_type == 0x0001) || (sd_card_type == 0x0002)) {
+       if (sd_card_type == 0x0001 || sd_card_type == 0x0002) {
                /* ROM card or OTP */
                chip->card_wp |= SD_CARD;
        }
@@ -2361,7 +2361,7 @@ RTY_SD_RST:
        retval = sd_send_cmd_get_rsp(chip, SEND_IF_COND, 0x000001AA,
                                     SD_RSP_TYPE_R7, rsp, 5);
        if (retval == STATUS_SUCCESS) {
-               if ((rsp[4] == 0xAA) && ((rsp[3] & 0x0f) == 0x01)) {
+               if (rsp[4] == 0xAA && ((rsp[3] & 0x0f) == 0x01)) {
                        hi_cap_flow = true;
                        voltage = SUPPORT_VOLTAGE | 0x40000000;
                }
@@ -2713,7 +2713,7 @@ static int mmc_test_switch_bus(struct rtsx_chip *chip, u8 width)
        if (width == MMC_8BIT_BUS) {
                dev_dbg(rtsx_dev(chip), "BUSTEST_R [8bits]: 0x%02x 0x%02x\n",
                        ptr[0], ptr[1]);
-               if ((ptr[0] == 0xAA) && (ptr[1] == 0x55)) {
+               if (ptr[0] == 0xAA && ptr[1] == 0x55) {
                        u8 rsp[5];
                        u32 arg;
 
@@ -2724,7 +2724,7 @@ static int mmc_test_switch_bus(struct rtsx_chip *chip, u8 width)
 
                        retval = sd_send_cmd_get_rsp(chip, SWITCH, arg,
                                                     SD_RSP_TYPE_R1b, rsp, 5);
-                       if ((retval == STATUS_SUCCESS) &&
+                       if (retval == STATUS_SUCCESS &&
                            !(rsp[4] & MMC_SWITCH_ERR))
                                return SWITCH_SUCCESS;
                }
@@ -2741,7 +2741,7 @@ static int mmc_test_switch_bus(struct rtsx_chip *chip, u8 width)
 
                        retval = sd_send_cmd_get_rsp(chip, SWITCH, arg,
                                                     SD_RSP_TYPE_R1b, rsp, 5);
-                       if ((retval == STATUS_SUCCESS) &&
+                       if (retval == STATUS_SUCCESS &&
                            !(rsp[4] & MMC_SWITCH_ERR))
                                return SWITCH_SUCCESS;
                }
@@ -2830,7 +2830,7 @@ static int mmc_switch_timing_bus(struct rtsx_chip *chip, bool switch_ddr)
 
                retval = sd_send_cmd_get_rsp(chip, SWITCH, 0x03B90100,
                                             SD_RSP_TYPE_R1b, rsp, 5);
-               if ((retval != STATUS_SUCCESS) || (rsp[4] & MMC_SWITCH_ERR))
+               if (retval != STATUS_SUCCESS || (rsp[4] & MMC_SWITCH_ERR))
                        CLR_MMC_HS(sd_card);
        }
 
@@ -2989,7 +2989,7 @@ MMC_UNLOCK_ENTRY:
                        }
                }
 
-               if (CHK_MMC_SECTOR_MODE(sd_card) && (sd_card->capacity == 0))
+               if (CHK_MMC_SECTOR_MODE(sd_card) && sd_card->capacity == 0)
                        return STATUS_FAIL;
 
                if (switch_ddr && CHK_MMC_DDR52(sd_card)) {
@@ -3333,11 +3333,11 @@ int sd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector,
        }
 
        if (sd_card->seq_mode &&
-           ((sd_card->pre_dir != srb->sc_data_direction) ||
+           (sd_card->pre_dir != srb->sc_data_direction ||
            ((sd_card->pre_sec_addr + sd_card->pre_sec_cnt) !=
            start_sector))) {
-               if ((sd_card->pre_sec_cnt < 0x80) &&
-                   (sd_card->pre_dir == DMA_FROM_DEVICE) &&
+               if (sd_card->pre_sec_cnt < 0x80 &&
+                   sd_card->pre_dir == DMA_FROM_DEVICE &&
                    !CHK_SD30_SPEED(sd_card) &&
                    !CHK_SD_HS(sd_card) &&
                    !CHK_MMC_HS(sd_card)) {
@@ -3361,7 +3361,7 @@ int sd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector,
                        goto RW_FAIL;
                }
 
-               if ((sd_card->pre_sec_cnt < 0x80) &&
+               if (sd_card->pre_sec_cnt < 0x80 &&
                    !CHK_SD30_SPEED(sd_card) &&
                    !CHK_SD_HS(sd_card) &&
                    !CHK_MMC_HS(sd_card)) {
@@ -3666,9 +3666,9 @@ RTY_SEND_CMD:
                }
        }
 
-       if ((cmd_idx == SELECT_CARD) || (cmd_idx == APP_CMD) ||
-           (cmd_idx == SEND_STATUS) || (cmd_idx == STOP_TRANSMISSION)) {
-               if ((cmd_idx != STOP_TRANSMISSION) && !special_check) {
+       if (cmd_idx == SELECT_CARD || cmd_idx == APP_CMD ||
+           cmd_idx == SEND_STATUS || cmd_idx == STOP_TRANSMISSION) {
+               if (cmd_idx != STOP_TRANSMISSION && !special_check) {
                        if (ptr[1] & 0x80)
                                return STATUS_FAIL;
                }
@@ -3772,10 +3772,10 @@ int sd_pass_thru_mode(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                return TRANSPORT_FAILED;
        }
 
-       if ((srb->cmnd[2] != 0x53) || (srb->cmnd[3] != 0x44) ||
-           (srb->cmnd[4] != 0x20) || (srb->cmnd[5] != 0x43) ||
-           (srb->cmnd[6] != 0x61) || (srb->cmnd[7] != 0x72) ||
-           (srb->cmnd[8] != 0x64)) {
+       if (srb->cmnd[2] != 0x53 || srb->cmnd[3] != 0x44 ||
+           srb->cmnd[4] != 0x20 || srb->cmnd[5] != 0x43 ||
+           srb->cmnd[6] != 0x61 || srb->cmnd[7] != 0x72 ||
+           srb->cmnd[8] != 0x64) {
                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                return TRANSPORT_FAILED;
        }
@@ -4596,10 +4596,10 @@ int sd_hw_rst(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                return TRANSPORT_FAILED;
        }
 
-       if ((srb->cmnd[2] != 0x53) || (srb->cmnd[3] != 0x44) ||
-           (srb->cmnd[4] != 0x20) || (srb->cmnd[5] != 0x43) ||
-           (srb->cmnd[6] != 0x61) || (srb->cmnd[7] != 0x72) ||
-           (srb->cmnd[8] != 0x64)) {
+       if (srb->cmnd[2] != 0x53 || srb->cmnd[3] != 0x44 ||
+           srb->cmnd[4] != 0x20 || srb->cmnd[5] != 0x43 ||
+           srb->cmnd[6] != 0x61 || srb->cmnd[7] != 0x72 ||
+           srb->cmnd[8] != 0x64) {
                set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                return TRANSPORT_FAILED;
        }