Skip to contentSkip to conversation

mmc: core: remove needless err = 0 in mmc_init_card()

PATCH In review Yue Hu 2 participants 2 messages Jan 13, 2021 MMC, SD and SDIO

lore
Share & tools
lore

Yue Hu

author
#0 lore raw

PATCH 1/1 mmc: core: remove needless err = 0 in mmc_init_card()

From: Yue Hu <[email protected]>

Since they will always being in successful path to return 0 directly, no need to set err = 0.

---
 drivers/mmc/core/mmc.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/mmc/core/mmc.c +0 -4
index ff3063c..54ab1c7 100644
@@ -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;
 		}
 	}
 	/*
Signature · 1 line
1.9.1
#1 lore raw
Quoted 7 lines · Yue Hu

From: Yue Hu <[email protected]>

Since they will always being in successful path to return 0 directly, no need to set err = 0.

Applied for next, thanks!

Kind regards
Uffe

Quoted 43 lines
---
 drivers/mmc/core/mmc.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/mmc/core/mmc.c +0 -5
index ff3063c..54ab1c7 100644
@@ -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;
                }
        }
        /*
--

1.9.1