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 39/57] staging/rts_pstor: remove braces {} in sd.c (mmc_test_switch_bus)
Date: Fri, 7 Sep 2012 13:35:14 +0900 [thread overview]
Message-ID: <1346992514-17642-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 any arm of this statement
-WARNING: braces {} are not necessary for single statement blocks
Signed-off-by: Toshiaki Yamane <yamanetoshi@gmail.com>
---
drivers/staging/rts_pstor/sd.c | 32 +++++++++++++-------------------
1 file changed, 13 insertions(+), 19 deletions(-)
diff --git a/drivers/staging/rts_pstor/sd.c b/drivers/staging/rts_pstor/sd.c
index 23fe9f2..ff8eb96 100644
--- a/drivers/staging/rts_pstor/sd.c
+++ b/drivers/staging/rts_pstor/sd.c
@@ -2544,9 +2544,8 @@ static int mmc_test_switch_bus(struct rtsx_chip *chip, u8 width)
int len;
retval = sd_send_cmd_get_rsp(chip, BUSTEST_W, 0, SD_RSP_TYPE_R1, NULL, 0);
- if (retval != STATUS_SUCCESS) {
+ if (retval != STATUS_SUCCESS)
TRACE_RET(chip, SWITCH_FAIL);
- }
if (width == MMC_8BIT_BUS) {
buf[0] = 0x55;
@@ -2575,9 +2574,8 @@ static int mmc_test_switch_bus(struct rtsx_chip *chip, u8 width)
rtsx_read_register(chip, REG_SD_STAT1, &val1);
rtsx_read_register(chip, REG_SD_STAT2, &val2);
rtsx_clear_sd_error(chip);
- if ((val1 & 0xE0) || val2) {
+ if ((val1 & 0xE0) || val2)
TRACE_RET(chip, SWITCH_ERR);
- }
} else {
rtsx_clear_sd_error(chip);
rtsx_write_register(chip, REG_SD_CFG3, 0x02, 0);
@@ -2597,11 +2595,10 @@ static int mmc_test_switch_bus(struct rtsx_chip *chip, u8 width)
rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD0, 0xFF, 0x40 | BUSTEST_R);
- if (width == MMC_8BIT_BUS) {
+ if (width == MMC_8BIT_BUS)
rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BYTE_CNT_L, 0xFF, 0x08);
- } else {
+ else
rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BYTE_CNT_L, 0xFF, 0x04);
- }
rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_L, 0xFF, 1);
rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_H, 0xFF, 0);
@@ -2614,9 +2611,8 @@ static int mmc_test_switch_bus(struct rtsx_chip *chip, u8 width)
rtsx_add_cmd(chip, CHECK_REG_CMD, REG_SD_TRANSFER, SD_TRANSFER_END, SD_TRANSFER_END);
rtsx_add_cmd(chip, READ_REG_CMD, PPBUF_BASE2, 0, 0);
- if (width == MMC_8BIT_BUS) {
+ if (width == MMC_8BIT_BUS)
rtsx_add_cmd(chip, READ_REG_CMD, PPBUF_BASE2 + 1, 0, 0);
- }
retval = rtsx_send_cmd(chip, SD_CARD, 100);
if (retval < 0) {
@@ -2632,15 +2628,14 @@ static int mmc_test_switch_bus(struct rtsx_chip *chip, u8 width)
u8 rsp[5];
u32 arg;
- if (CHK_MMC_DDR52(sd_card)) {
+ if (CHK_MMC_DDR52(sd_card))
arg = 0x03B70600;
- } else {
+ else
arg = 0x03B70200;
- }
+
retval = sd_send_cmd_get_rsp(chip, SWITCH, arg, SD_RSP_TYPE_R1b, rsp, 5);
- if ((retval == STATUS_SUCCESS) && !(rsp[4] & MMC_SWITCH_ERR)) {
+ if ((retval == STATUS_SUCCESS) && !(rsp[4] & MMC_SWITCH_ERR))
return SWITCH_SUCCESS;
- }
}
} else {
RTSX_DEBUGP("BUSTEST_R [4bits]: 0x%02x\n", ptr[0]);
@@ -2648,15 +2643,14 @@ static int mmc_test_switch_bus(struct rtsx_chip *chip, u8 width)
u8 rsp[5];
u32 arg;
- if (CHK_MMC_DDR52(sd_card)) {
+ if (CHK_MMC_DDR52(sd_card))
arg = 0x03B70500;
- } else {
+ else
arg = 0x03B70100;
- }
+
retval = sd_send_cmd_get_rsp(chip, SWITCH, arg, SD_RSP_TYPE_R1b, rsp, 5);
- if ((retval == STATUS_SUCCESS) && !(rsp[4] & MMC_SWITCH_ERR)) {
+ if ((retval == STATUS_SUCCESS) && !(rsp[4] & MMC_SWITCH_ERR))
return SWITCH_SUCCESS;
- }
}
}
--
1.7.9.5
next prev parent reply other threads:[~2012-09-07 4:35 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 ` Toshiaki Yamane [this message]
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 ` [PATCH 52/57] staging/rts_pstor: remove braces {} in sd.c (sd_execute_no_data) Toshiaki Yamane
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=1346992514-17642-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;
as well as URLs for NNTP newsgroup(s).