]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
mmc: cb710: fix indentation issue in if block
authorColin Ian King <colin.king@canonical.com>
Thu, 7 Feb 2019 12:59:06 +0000 (12:59 +0000)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 25 Feb 2019 07:40:58 +0000 (08:40 +0100)
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>
drivers/mmc/host/cb710-mmc.c

index 1087b4c79cd661bbf8bfe57f73470e681324b668..4c477dcd2adab71a8ac318d50094ba590c04bad4 100644 (file)
@@ -566,30 +566,32 @@ static void cb710_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 
        cb710_mmc_select_clock_divider(mmc, ios->clock);
 
-       if (ios->power_mode != reader->last_power_mode)
-       switch (ios->power_mode) {
-       case MMC_POWER_ON:
-               err = cb710_mmc_powerup(slot);
-               if (err) {
-                       dev_warn(cb710_slot_dev(slot),
-                               "powerup failed (%d)- retrying\n", err);
-                       cb710_mmc_powerdown(slot);
-                       udelay(1);
+       if (ios->power_mode != reader->last_power_mode) {
+               switch (ios->power_mode) {
+               case MMC_POWER_ON:
                        err = cb710_mmc_powerup(slot);
-                       if (err)
+                       if (err) {
                                dev_warn(cb710_slot_dev(slot),
-                                       "powerup retry failed (%d) - expect errors\n",
+                                       "powerup failed (%d)- retrying\n", err);
+                               cb710_mmc_powerdown(slot);
+                               udelay(1);
+                               err = cb710_mmc_powerup(slot);
+                               if (err)
+                                       dev_warn(cb710_slot_dev(slot),
+                                               "powerup retry failed (%d) - expect errors\n",
                                        err);
+                       }
+                       reader->last_power_mode = MMC_POWER_ON;
+                       break;
+               case MMC_POWER_OFF:
+                       cb710_mmc_powerdown(slot);
+                       reader->last_power_mode = MMC_POWER_OFF;
+                       break;
+               case MMC_POWER_UP:
+               default:
+                       /* ignore */
+                       break;
                }
-               reader->last_power_mode = MMC_POWER_ON;
-               break;
-       case MMC_POWER_OFF:
-               cb710_mmc_powerdown(slot);
-               reader->last_power_mode = MMC_POWER_OFF;
-               break;
-       case MMC_POWER_UP:
-       default:
-               /* ignore */;
        }
 
        cb710_mmc_enable_4bit_data(slot, ios->bus_width != MMC_BUS_WIDTH_1);