diff options
author | Colin Ian King <colin.king@canonical.com> | 2019-02-07 07:59:06 -0500 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2019-02-25 02:40:58 -0500 |
commit | c16e9b7656ae58f8d68b375a30863146e345018b (patch) | |
tree | a4636e439c574174203a9247e705c28ed20a258f /drivers/mmc | |
parent | 68539e2bc34437d8c5fbcc234dddcc40bd6bb1cb (diff) |
mmc: cb710: fix indentation issue in if block
There is an if block that is not indented, fix this. Also add a
break statement on the default case to clean up a cppcheck warning.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/host/cb710-mmc.c | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/drivers/mmc/host/cb710-mmc.c b/drivers/mmc/host/cb710-mmc.c index 1087b4c79cd6..4c477dcd2ada 100644 --- a/drivers/mmc/host/cb710-mmc.c +++ b/drivers/mmc/host/cb710-mmc.c | |||
@@ -566,30 +566,32 @@ static void cb710_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) | |||
566 | 566 | ||
567 | cb710_mmc_select_clock_divider(mmc, ios->clock); | 567 | cb710_mmc_select_clock_divider(mmc, ios->clock); |
568 | 568 | ||
569 | if (ios->power_mode != reader->last_power_mode) | 569 | if (ios->power_mode != reader->last_power_mode) { |
570 | switch (ios->power_mode) { | 570 | switch (ios->power_mode) { |
571 | case MMC_POWER_ON: | 571 | case MMC_POWER_ON: |
572 | err = cb710_mmc_powerup(slot); | ||
573 | if (err) { | ||
574 | dev_warn(cb710_slot_dev(slot), | ||
575 | "powerup failed (%d)- retrying\n", err); | ||
576 | cb710_mmc_powerdown(slot); | ||
577 | udelay(1); | ||
578 | err = cb710_mmc_powerup(slot); | 572 | err = cb710_mmc_powerup(slot); |
579 | if (err) | 573 | if (err) { |
580 | dev_warn(cb710_slot_dev(slot), | 574 | dev_warn(cb710_slot_dev(slot), |
581 | "powerup retry failed (%d) - expect errors\n", | 575 | "powerup failed (%d)- retrying\n", err); |
576 | cb710_mmc_powerdown(slot); | ||
577 | udelay(1); | ||
578 | err = cb710_mmc_powerup(slot); | ||
579 | if (err) | ||
580 | dev_warn(cb710_slot_dev(slot), | ||
581 | "powerup retry failed (%d) - expect errors\n", | ||
582 | err); | 582 | err); |
583 | } | ||
584 | reader->last_power_mode = MMC_POWER_ON; | ||
585 | break; | ||
586 | case MMC_POWER_OFF: | ||
587 | cb710_mmc_powerdown(slot); | ||
588 | reader->last_power_mode = MMC_POWER_OFF; | ||
589 | break; | ||
590 | case MMC_POWER_UP: | ||
591 | default: | ||
592 | /* ignore */ | ||
593 | break; | ||
583 | } | 594 | } |
584 | reader->last_power_mode = MMC_POWER_ON; | ||
585 | break; | ||
586 | case MMC_POWER_OFF: | ||
587 | cb710_mmc_powerdown(slot); | ||
588 | reader->last_power_mode = MMC_POWER_OFF; | ||
589 | break; | ||
590 | case MMC_POWER_UP: | ||
591 | default: | ||
592 | /* ignore */; | ||
593 | } | 595 | } |
594 | 596 | ||
595 | cb710_mmc_enable_4bit_data(slot, ios->bus_width != MMC_BUS_WIDTH_1); | 597 | cb710_mmc_enable_4bit_data(slot, ios->bus_width != MMC_BUS_WIDTH_1); |