Commit 3c377644 authored by Wayne Porter's avatar Wayne Porter Committed by Greg Kroah-Hartman

staging: rts5208: sd.c: Fix logical continuations

Checkpatch detected && at the beginning of new lines
Signed-off-by: default avatarWayne Porter <wporter82@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 57a3fcfa
...@@ -1404,22 +1404,22 @@ static int sd_switch_function(struct rtsx_chip *chip, u8 bus_width) ...@@ -1404,22 +1404,22 @@ static int sd_switch_function(struct rtsx_chip *chip, u8 bus_width)
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
switch ((u8)(chip->sd_speed_prior >> (i*8))) { switch ((u8)(chip->sd_speed_prior >> (i*8))) {
case SDR104_SUPPORT: case SDR104_SUPPORT:
if ((sd_card->func_group1_mask & SDR104_SUPPORT_MASK) if ((sd_card->func_group1_mask & SDR104_SUPPORT_MASK) &&
&& chip->sdr104_en) { chip->sdr104_en) {
func_to_switch = SDR104_SUPPORT; func_to_switch = SDR104_SUPPORT;
} }
break; break;
case DDR50_SUPPORT: case DDR50_SUPPORT:
if ((sd_card->func_group1_mask & DDR50_SUPPORT_MASK) if ((sd_card->func_group1_mask & DDR50_SUPPORT_MASK) &&
&& chip->ddr50_en) { chip->ddr50_en) {
func_to_switch = DDR50_SUPPORT; func_to_switch = DDR50_SUPPORT;
} }
break; break;
case SDR50_SUPPORT: case SDR50_SUPPORT:
if ((sd_card->func_group1_mask & SDR50_SUPPORT_MASK) if ((sd_card->func_group1_mask & SDR50_SUPPORT_MASK) &&
&& chip->sdr50_en) { chip->sdr50_en) {
func_to_switch = SDR50_SUPPORT; func_to_switch = SDR50_SUPPORT;
} }
break; break;
...@@ -3746,11 +3746,11 @@ int sd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector, ...@@ -3746,11 +3746,11 @@ int sd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector,
((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) != ((sd_card->pre_sec_addr + sd_card->pre_sec_cnt) !=
start_sector))) { start_sector))) {
if ((sd_card->pre_sec_cnt < 0x80) if ((sd_card->pre_sec_cnt < 0x80) &&
&& (sd_card->pre_dir == DMA_FROM_DEVICE) (sd_card->pre_dir == DMA_FROM_DEVICE) &&
&& !CHK_SD30_SPEED(sd_card) !CHK_SD30_SPEED(sd_card) &&
&& !CHK_SD_HS(sd_card) !CHK_SD_HS(sd_card) &&
&& !CHK_MMC_HS(sd_card)) { !CHK_MMC_HS(sd_card)) {
sd_send_cmd_get_rsp(chip, SEND_STATUS, sd_card->sd_addr, sd_send_cmd_get_rsp(chip, SEND_STATUS, sd_card->sd_addr,
SD_RSP_TYPE_R1, NULL, 0); SD_RSP_TYPE_R1, NULL, 0);
} }
...@@ -3773,10 +3773,10 @@ int sd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector, ...@@ -3773,10 +3773,10 @@ int sd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector,
goto RW_FAIL; goto RW_FAIL;
} }
if ((sd_card->pre_sec_cnt < 0x80) if ((sd_card->pre_sec_cnt < 0x80) &&
&& !CHK_SD30_SPEED(sd_card) !CHK_SD30_SPEED(sd_card) &&
&& !CHK_SD_HS(sd_card) !CHK_SD_HS(sd_card) &&
&& !CHK_MMC_HS(sd_card)) { !CHK_MMC_HS(sd_card)) {
sd_send_cmd_get_rsp(chip, SEND_STATUS, sd_card->sd_addr, sd_send_cmd_get_rsp(chip, SEND_STATUS, sd_card->sd_addr,
SD_RSP_TYPE_R1, NULL, 0); SD_RSP_TYPE_R1, NULL, 0);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment