Skip to contentSkip to conversation

mmc: sdhci-cadence: fix logically and structurally dead code

PATCH Applied Gustavo A. R. Silva 4 participants 4 messages Apr 19, 2018 – Apr 20, 2018

Subsystems (3)
MMC, SD and SDIO Secure digital host controller interface (SDHCI) driver Secure digital host controller interface (SDHCI) cadence driver
lore
Share & tools
lore

Gustavo A. R. Silva

author
#0 lore raw

PATCH v2 1/1 mmc: sdhci-cadence: fix logically and structurally dead code

Currently, the code block inside the for loop will never execute more than once, because the function returns inmediately after the first iteration, hence the execution of the code at the second iteration is structurally dead and, code at line 281: return 0; is never reached.

Fix this by checking _ret_ before return.

Addresses-Coverity-ID: 1468009 ("Logically dead code")
Addresses-Coverity-ID: 1468002 ("Structurally dead code")

Suggested-by Masahiro Yamada <[email protected]>
Signed-off-by Gustavo A. R. Silva <[email protected]>

---
Changes in v2:
- Update changelog.
- Drop the 'Fixes' tag.
- Add check on ret instead of removing the "return ret;" line.
- Thanks to Masahiro Yamada for the feedback provided.

 drivers/mmc/host/sdhci-cadence.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mmc/host/sdhci-cadence.c +2 -2
index bc30d16..7a343b8 100644
@@ -274,8 +274,8 @@ static int sdhci_cdns_set_tune_val(struct sdhci_host *host, unsigned int val)
 		ret = readl_poll_timeout(reg, tmp,
 					 !(tmp & SDHCI_CDNS_HRS06_TUNE_UP),
 					 0, 1);
-
-		return ret;
+		if (ret)
+			return ret;
 	}
 
 	return 0;
Signature · 1 line
2.7.4
Acked-by on v2 1/1
#1 lore raw

2018-04-20 0:59 GMT+09:00 Gustavo A. R. Silva <[email protected]>:

Quoted 6 lines

Currently, the code block inside the for loop will never execute more than once, because the function returns inmediately after the first iteration, hence the execution of the code at the second iteration is structurally dead and, code at line 281: return 0; is never reached.

Quoted 7 lines

Fix this by checking _ret_ before return.

Addresses-Coverity-ID: 1468009 ("Logically dead code")
Addresses-Coverity-ID: 1468002 ("Structurally dead code")

Suggested-by Masahiro Yamada <[email protected]>
Signed-off-by Gustavo A. R. Silva <[email protected]>

---

Looks good to me except the typo in the log

inmediately -> immediately

Acked-by Masahiro Yamada <[email protected]>
Quoted 27 lines

Changes in v2:
- Update changelog.
- Drop the 'Fixes' tag.
- Add check on ret instead of removing the "return ret;" line.
- Thanks to Masahiro Yamada for the feedback provided.

 drivers/mmc/host/sdhci-cadence.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mmc/host/sdhci-cadence.c +2 -3
index bc30d16..7a343b8 100644
@@ -274,8 +274,8 @@ static int sdhci_cdns_set_tune_val(struct sdhci_host *host, unsigned int val)
                ret = readl_poll_timeout(reg, tmp,
                                         !(tmp & SDHCI_CDNS_HRS06_TUNE_UP),
                                         0, 1);
-
-               return ret;
+               if (ret)
+                       return ret;
        }
 
        return 0;
--

2.7.4

Signature · 2 lines
Best Regards
Masahiro Yamada
maintainer Acked-by on v2 1/1
#2 lore raw
In reply to Gustavo A. R. Silva
Quoted 6 lines · Gustavo A. R. Silva

Currently, the code block inside the for loop will never execute more than once, because the function returns inmediately after the first iteration, hence the execution of the code at the second iteration is structurally dead and, code at line 281: return 0; is never reached.

Quoted 6 lines

Fix this by checking _ret_ before return.

Addresses-Coverity-ID: 1468009 ("Logically dead code")
Addresses-Coverity-ID: 1468002 ("Structurally dead code")

Suggested-by Masahiro Yamada <[email protected]>
Signed-off-by Gustavo A. R. Silva <[email protected]>
Acked-by Adrian Hunter <[email protected]>
Quoted 26 lines

---
Changes in v2:
- Update changelog.
- Drop the 'Fixes' tag.
- Add check on ret instead of removing the "return ret;" line.
- Thanks to Masahiro Yamada for the feedback provided.

 drivers/mmc/host/sdhci-cadence.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mmc/host/sdhci-cadence.c +2 -2
index bc30d16..7a343b8 100644
@@ -274,8 +274,8 @@ static int sdhci_cdns_set_tune_val(struct sdhci_host *host, unsigned int val)
 		ret = readl_poll_timeout(reg, tmp,
 					 !(tmp & SDHCI_CDNS_HRS06_TUNE_UP),
 					 0, 1);
-
-		return ret;
+		if (ret)
+			return ret;
 	}
 
 	return 0;
Applied
#3 lore raw
In reply to Gustavo A. R. Silva
Quoted 6 lines · Gustavo A. R. Silva

Currently, the code block inside the for loop will never execute more than once, because the function returns inmediately after the first iteration, hence the execution of the code at the second iteration is structurally dead and, code at line 281: return 0; is never reached.

Quoted 6 lines

Fix this by checking _ret_ before return.

Addresses-Coverity-ID: 1468009 ("Logically dead code")
Addresses-Coverity-ID: 1468002 ("Structurally dead code")

Suggested-by Masahiro Yamada <[email protected]>
Signed-off-by Gustavo A. R. Silva <[email protected]>

Thanks, applied for next and by fixing the minor spelling mistake in the changelog.

Kind regards
Uffe

Quoted 28 lines

---
Changes in v2:
- Update changelog.
- Drop the 'Fixes' tag.
- Add check on ret instead of removing the "return ret;" line.
- Thanks to Masahiro Yamada for the feedback provided.

 drivers/mmc/host/sdhci-cadence.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mmc/host/sdhci-cadence.c +2 -3
index bc30d16..7a343b8 100644
@@ -274,8 +274,8 @@ static int sdhci_cdns_set_tune_val(struct sdhci_host *host, unsigned int val)
                ret = readl_poll_timeout(reg, tmp,
                                         !(tmp & SDHCI_CDNS_HRS06_TUNE_UP),
                                         0, 1);
-
-               return ret;
+               if (ret)
+                       return ret;
        }
 
        return 0;
--

2.7.4