summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYue Hu <huyue2@yulong.com>2021-01-13 19:34:31 +0800
committerUlf Hansson <ulf.hansson@linaro.org>2021-02-01 11:54:45 +0100
commit1c148853e8eb433ec88cf0b9482376ec7814b599 (patch)
tree7cf06a4a82eca91b31fde3424be935820e54e3ba
parent754b7f2f7d2acda729619c6cfed9bc8124ca17cb (diff)
downloadlinux-1c148853e8eb433ec88cf0b9482376ec7814b599.tar.bz2
mmc: core: remove needless err = 0 in mmc_init_card()
Since they will always being in successful path to return 0 directly, no need to set err = 0. Signed-off-by: Yue Hu <huyue2@yulong.com> Link: https://lore.kernel.org/r/20210113113431.522-1-zbestahu@gmail.com Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-rw-r--r--drivers/mmc/core/mmc.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index ff3063ce2acd..54ab1c7405e5 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1697,7 +1697,6 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
goto free_card;
if (err) {
- err = 0;
/*
* Just disable enhanced area off & sz
* will try to enable ERASE_GROUP_DEF
@@ -1802,7 +1801,6 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
pr_warn("%s: Enabling HPI failed\n",
mmc_hostname(card->host));
card->ext_csd.hpi_en = 0;
- err = 0;
} else {
card->ext_csd.hpi_en = 1;
}
@@ -1831,7 +1829,6 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
pr_warn("%s: Cache is supported, but failed to turn on (%d)\n",
mmc_hostname(card->host), err);
card->ext_csd.cache_ctrl = 0;
- err = 0;
} else {
card->ext_csd.cache_ctrl = 1;
}
@@ -1851,7 +1848,6 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
mmc_hostname(card->host));
card->ext_csd.cmdq_support = false;
card->ext_csd.cmdq_depth = 0;
- err = 0;
}
}
/*