mmc: core: remove needless err = 0 in mmc_init_card()
authorYue Hu <huyue2@yulong.com>
Wed, 13 Jan 2021 11:34:31 +0000 (19:34 +0800)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 1 Feb 2021 10:54:45 +0000 (11:54 +0100)
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>
drivers/mmc/core/mmc.c

index ff3063c..54ab1c7 100644 (file)
@@ -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;
                }
        }
        /*