mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Toshiaki Yamane <yamanetoshi@gmail.com>
To: Greg Kroah-Hartman <greg@kroah.com>
Cc: linux-kernel@vger.kernel.org, Toshiaki Yamane <yamanetoshi@gmail.com>
Subject: [PATCH 52/57] staging/rts_pstor: remove braces {} in sd.c (sd_execute_no_data)
Date: Fri,  7 Sep 2012 13:38:28 +0900	[thread overview]
Message-ID: <1346992708-18064-1-git-send-email-yamanetoshi@gmail.com> (raw)
In-Reply-To: <1346991387-16321-1-git-send-email-yamanetoshi@gmail.com>

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 |   41 +++++++++++++++-------------------------
 1 file changed, 15 insertions(+), 26 deletions(-)

diff --git a/drivers/staging/rts_pstor/sd.c b/drivers/staging/rts_pstor/sd.c
index 23090cb..ccd6f88 100644
--- a/drivers/staging/rts_pstor/sd.c
+++ b/drivers/staging/rts_pstor/sd.c
@@ -3757,9 +3757,8 @@ int sd_execute_no_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 	}
 
 	retval = sd_switch_clock(chip);
-	if (retval != STATUS_SUCCESS) {
+	if (retval != STATUS_SUCCESS)
 		TRACE_RET(chip, TRANSPORT_FAILED);
-	}
 
 	if (sd_card->pre_cmd_err) {
 		sd_card->pre_cmd_err = 0;
@@ -3768,12 +3767,11 @@ int sd_execute_no_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 	}
 
 	cmd_idx = srb->cmnd[2] & 0x3F;
-	if (srb->cmnd[1] & 0x02) {
+	if (srb->cmnd[1] & 0x02)
 		standby = 1;
-	}
-	if (srb->cmnd[1] & 0x01) {
+
+	if (srb->cmnd[1] & 0x01)
 		acmd = 1;
-	}
 
 	arg = ((u32)srb->cmnd[3] << 24) | ((u32)srb->cmnd[4] << 16) |
 		((u32)srb->cmnd[5] << 8) | srb->cmnd[6];
@@ -3786,64 +3784,56 @@ int sd_execute_no_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 	sd_card->last_rsp_type = rsp_type;
 
 	retval = sd_switch_clock(chip);
-	if (retval != STATUS_SUCCESS) {
+	if (retval != STATUS_SUCCESS)
 		TRACE_RET(chip, TRANSPORT_FAILED);
-	}
 
 #ifdef SUPPORT_SD_LOCK
 	if ((sd_card->sd_lock_status & SD_LOCK_1BIT_MODE) == 0) {
 		if (CHK_MMC_8BIT(sd_card)) {
 			retval = rtsx_write_register(chip, REG_SD_CFG1, 0x03, SD_BUS_WIDTH_8);
-			if (retval != STATUS_SUCCESS) {
+			if (retval != STATUS_SUCCESS)
 				TRACE_RET(chip, TRANSPORT_FAILED);
-			}
+
 		} else if (CHK_SD(sd_card) || CHK_MMC_4BIT(sd_card)) {
 			retval = rtsx_write_register(chip, REG_SD_CFG1, 0x03, SD_BUS_WIDTH_4);
-			if (retval != STATUS_SUCCESS) {
+			if (retval != STATUS_SUCCESS)
 				TRACE_RET(chip, TRANSPORT_FAILED);
-			}
 		}
 	}
 #else
 	retval = rtsx_write_register(chip, REG_SD_CFG1, 0x03, SD_BUS_WIDTH_4);
-	if (retval != STATUS_SUCCESS) {
+	if (retval != STATUS_SUCCESS)
 		TRACE_RET(chip, TRANSPORT_FAILED);
-	}
 #endif
 
 	if (standby) {
 		retval = sd_select_card(chip, 0);
-		if (retval != STATUS_SUCCESS) {
+		if (retval != STATUS_SUCCESS)
 			TRACE_GOTO(chip, SD_Execute_Cmd_Failed);
-		}
 	}
 
 	if (acmd) {
 		retval = ext_sd_send_cmd_get_rsp(chip, APP_CMD, sd_card->sd_addr,
 				SD_RSP_TYPE_R1, NULL, 0, 0);
-		if (retval != STATUS_SUCCESS) {
+		if (retval != STATUS_SUCCESS)
 			TRACE_GOTO(chip, SD_Execute_Cmd_Failed);
-		}
 	}
 
 	retval = ext_sd_send_cmd_get_rsp(chip, cmd_idx, arg, rsp_type,
 			sd_card->rsp, rsp_len, 0);
-	if (retval != STATUS_SUCCESS) {
+	if (retval != STATUS_SUCCESS)
 		TRACE_GOTO(chip, SD_Execute_Cmd_Failed);
-	}
 
 	if (standby) {
 		retval = sd_select_card(chip, 1);
-		if (retval != STATUS_SUCCESS) {
+		if (retval != STATUS_SUCCESS)
 			TRACE_GOTO(chip, SD_Execute_Cmd_Failed);
-		}
 	}
 
 #ifdef SUPPORT_SD_LOCK
 	retval = sd_update_lock_status(chip);
-	if (retval != STATUS_SUCCESS) {
+	if (retval != STATUS_SUCCESS)
 		TRACE_GOTO(chip, SD_Execute_Cmd_Failed);
-	}
 #endif
 
 	scsi_set_resid(srb, 0);
@@ -3854,9 +3844,8 @@ SD_Execute_Cmd_Failed:
 	set_sense_type(chip, lun, SENSE_TYPE_NO_SENSE);
 	release_sd_card(chip);
 	do_reset_sd_card(chip);
-	if (!(chip->card_ready & SD_CARD)) {
+	if (!(chip->card_ready & SD_CARD))
 		set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
-	}
 
 	TRACE_RET(chip, TRANSPORT_FAILED);
 }
-- 
1.7.9.5


  parent reply	other threads:[~2012-09-07  4:38 UTC|newest]

Thread overview: 65+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-01 13:43 [PATCH] staging/rts_pstor: remove braces {} in sd.c Toshiaki Yamane
2012-09-01 15:05 ` devendra.aaru
2012-09-02  0:55   ` Joe Perches
2012-09-02  9:03     ` devendra.aaru
2012-09-02  8:38   ` Toshiaki Yamane
2012-09-04 19:30 ` Greg Kroah-Hartman
2012-09-05  8:19   ` Toshiaki Yamane
2012-09-07  2:30   ` Toshiaki Yamane
2012-09-07  4:16 ` [PATCH 01/57] staging/rts_pstor: remove braces {} in sd.c (sd_send_cmd_get_rsp) Toshiaki Yamane
2012-09-07  4:22   ` [PATCH 02/57] staging/rts_pstor: remove braces {} in sd.c (sd_read_data) Toshiaki Yamane
2012-09-07  4:23   ` [PATCH 03/57] staging/rts_pstor: remove braces {} in sd.c (sd_write_data) Toshiaki Yamane
2012-09-07  4:23   ` [PATCH 04/57] staging/rts_pstor: remove braces {} in sd.c (sd_check_csd) Toshiaki Yamane
2012-09-07  4:23   ` [PATCH 05/57] staging/rts_pstor: remove braces {} in sd.c (sd_set_sample_push_timing) Toshiaki Yamane
2012-09-07  4:24   ` [PATCH 06/57] staging/rts_pstor: remove braces {} in sd.c (sd_choose_proper_clock) Toshiaki Yamane
2012-09-07  4:24   ` [PATCH 07/57] staging/rts_pstor: remove braces {} in sd.c (sd_set_clock_divider) Toshiaki Yamane
2012-09-07  4:25   ` [PATCH 08/57] staging/rts_pstor: remove braces {} in sd.c (sd_set_init_para) Toshiaki Yamane
2012-09-07  4:25   ` [PATCH 09/57] staging/rts_pstor: remove braces {} in sd.c (sd_select_card) Toshiaki Yamane
2012-09-07  4:26   ` [PATCH 10/57] staging/rts_pstor: remove braces {} in sd.c (sd_update_lock_status) Toshiaki Yamane
2012-09-07  4:26   ` [PATCH 11/57] staging/rts_pstor: remove braces {} in sd.c (sd_wait_state_data_ready) Toshiaki Yamane
2012-09-07  4:27   ` [PATCH 12/57] staging/rts_pstor: remove braces {} in sd.c (sd_change_bank_voltage) Toshiaki Yamane
2012-09-07  4:27   ` [PATCH 13/57] staging/rts_pstor: remove braces {} in sd.c (sd_voltage_switch) Toshiaki Yamane
2012-09-07  4:27   ` [PATCH 14/57] staging/rts_pstor: remove braces {} in sd.c (sd_change_phase) Toshiaki Yamane
2012-09-07  4:27   ` [PATCH 15/57] staging/rts_pstor: remove braces {} in sd.c (sd_check_spec) Toshiaki Yamane
2012-09-07  4:28   ` [PATCH 16/57] staging/rts_pstor: remove braces {} in sd.c (sd_check_switch_mode) Toshiaki Yamane
2012-09-07  4:28   ` [PATCH 17/57] staging/rts_pstor: remove braces {} in sd.c (downgrade_switch_mode) Toshiaki Yamane
2012-09-07  4:28   ` [PATCH 18/57] staging/rts_pstor: remove braces {} in sd.c (sd_check_switch) Toshiaki Yamane
2012-09-07  4:29   ` [PATCH 19/57] staging/rts_pstor: remove braces {} in sd.c (sd_switch_function) Toshiaki Yamane
2012-09-07  4:29   ` [PATCH 20/57] staging/rts_pstor: remove braces {} in sd.c (sd_sdr_tuning_rx_cmd) Toshiaki Yamane
2012-09-07  4:29   ` [PATCH 21/57] staging/rts_pstor: remove braces {} in sd.c (sd_ddr_tuning_rx_cmd) Toshiaki Yamane
2012-09-07  4:29   ` [PATCH 22/57] staging/rts_pstor: remove braces {} in sd.c (mmc_ddr_tunning_rx_cmd) Toshiaki Yamane
2012-09-07  4:30   ` [PATCH 23/57] staging/rts_pstor: remove braces {} in sd.c (sd_sdr_tuning_tx_cmd) Toshiaki Yamane
2012-09-07  4:30   ` [PATCH 24/57] staging/rts_pstor: remove braces {} in sd.c (sd_ddr_tuning_tx_cmd) Toshiaki Yamane
2012-09-07  4:30   ` [PATCH 25/57] staging/rts_pstor: remove braces {} in sd.c (sd_search_final_phase) Toshiaki Yamane
2012-09-07  4:30   ` [PATCH 26/57] staging/rts_pstor: remove braces {} in sd.c (sd_tuning_rx) Toshiaki Yamane
2012-09-07  4:31   ` [PATCH 27/57] staging/rts_pstor: remove braces {} in sd.c (sd_ddr_pre_tuning_tx) Toshiaki Yamane
2012-09-07  4:31   ` [PATCH 28/57] staging/rts_pstor: remove braces {} in sd.c (sd_tuning_tx) Toshiaki Yamane
2012-09-07  4:31   ` [PATCH 29/57] staging/rts_pstor: remove braces {} in sd.c (sd_sdr_tuning) Toshiaki Yamane
2012-09-07  4:32   ` [PATCH 30/57] staging/rts_pstor: remove braces {} in sd.c (sd_ddr_tuning) Toshiaki Yamane
2012-09-07  4:32   ` [PATCH 31/57] staging/rts_pstor: remove braces {} in sd.c (mmc_ddr_tuning) Toshiaki Yamane
2012-09-07  4:33   ` [PATCH 32/57] staging/rts_pstor: remove braces {} in sd.c (sd_switch_clock) Toshiaki Yamane
2012-09-07  4:33   ` [PATCH 33/57] staging/rts_pstor: remove braces {} in sd.c (sd_prepare_reset) Toshiaki Yamane
2012-09-07  4:34   ` [PATCH 34/57] staging/rts_pstor: remove braces {} in sd.c (sd_pull_ctl_enable) Toshiaki Yamane
2012-09-07  4:34   ` [PATCH 35/57] staging/rts_pstor: remove braces {} in sd.c (sd_init_power) Toshiaki Yamane
2012-09-07  4:34   ` [PATCH 36/57] staging/rts_pstor: remove braces {} in sd.c (sd_read_lba0) Toshiaki Yamane
2012-09-07  4:34   ` [PATCH 37/57] staging/rts_pstor: remove braces {} in sd.c (sd_check_wp_state) Toshiaki Yamane
2012-09-07  4:35   ` [PATCH 38/57] staging/rts_pstor: remove braces {} in sd.c (reset_sd) Toshiaki Yamane
2012-09-07  4:35   ` [PATCH 39/57] staging/rts_pstor: remove braces {} in sd.c (mmc_test_switch_bus) Toshiaki Yamane
2012-09-07  4:35   ` [PATCH 40/57] staging/rts_pstor: remove braces {} in sd.c (mmc_switch_timing_bus) Toshiaki Yamane
2012-09-07  4:35   ` [PATCH 41/57] staging/rts_pstor: remove braces {} in sd.c (reset_mmc) Toshiaki Yamane
2012-09-07  4:35   ` [PATCH 42/57] staging/rts_pstor: remove braces {} in sd.c (reset_sd_card) Toshiaki Yamane
2012-09-07  4:36   ` [PATCH 43/57] staging/rts_pstor: remove braces {} in sd.c (reset_mmc_only) Toshiaki Yamane
2012-09-07  4:36   ` [PATCH 44/57] staging/rts_pstor: remove braces {} in sd.c (wait_data_buf_ready) Toshiaki Yamane
2012-09-07  4:36   ` [PATCH 45/57] staging/rts_pstor: remove braces {} in sd.c (sd_stop_seq_mode) Toshiaki Yamane
2012-09-07  4:36   ` [PATCH 46/57] staging/rts_pstor: remove braces {} in sd.c (sd_auto_tune_clock) Toshiaki Yamane
2012-09-07  4:37   ` [PATCH 47/57] staging/rts_pstor: remove braces {} in sd.c (sd_rw) Toshiaki Yamane
2012-09-07  4:37   ` [PATCH 48/57] staging/rts_pstor: remove braces {} in sd.c (ext_sd_send_cmd_get_rsp) Toshiaki Yamane
2012-09-07  4:37   ` [PATCH 49/57] staging/rts_pstor: remove braces {} in sd.c (ext_sd_get_rsp) Toshiaki Yamane
2012-09-07  4:38   ` [PATCH 50/57] staging/rts_pstor: remove braces {} in sd.c (sd_pass_thru_mode) Toshiaki Yamane
2012-09-07  4:38   ` [PATCH 51/57] staging/rts_pstor: remove braces {} in sd.c (get_rsp_type) Toshiaki Yamane
2012-09-07  4:38   ` Toshiaki Yamane [this message]
2012-09-07  4:38   ` [PATCH 53/57] staging/rts_pstor: remove braces {} in sd.c (sd_execute_read_data) Toshiaki Yamane
2012-09-07  4:38   ` [PATCH 54/57] staging/rts_pstor: remove braces {} in sd.c (sd_execute_write_data) Toshiaki Yamane
2012-09-07  4:39   ` [PATCH 55/57] staging/rts_pstor: remove braces {} in sd.c (sd_hw_rst) Toshiaki Yamane
2012-09-07  4:39   ` [PATCH 56/57] staging/rts_pstor: remove braces {} in sd.c (sd_power_off_card3v3) Toshiaki Yamane
2012-09-07  4:39   ` [PATCH 57/57] staging/rts_pstor: remove braces {} in sd.c (release_sd_card) Toshiaki Yamane

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1346992708-18064-1-git-send-email-yamanetoshi@gmail.com \
    --to=yamanetoshi@gmail.com \
    --cc=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®