| Message ID | 1443201500-9256-2-git-send-email-tjakobi@math.uni-bielefeld.de |
|---|---|
| State | Changes Requested |
| Delegated to: | Minkyu Kang |
| Headers | show |
Hello Tobias, On 09/25/2015 07:18 PM, Tobias Jakobi wrote: > exynos_mmc_init() always returns zero, so for the caller > it looks like it never fails. > > Correct this by returning the error code of process_nodes(). > For process_nodes() do something similar and return early > when do_sdhci_init() fails. > > v2: Only fail in process_nodes() if we fail on all > available nodes. > > Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de> > --- > drivers/mmc/s5p_sdhci.c | 18 ++++++++++++------ > 1 file changed, 12 insertions(+), 6 deletions(-) > > diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c > index e9c43a9..b461fde 100644 > --- a/drivers/mmc/s5p_sdhci.c > +++ b/drivers/mmc/s5p_sdhci.c > @@ -172,6 +172,7 @@ static int process_nodes(const void *blob, int node_list[], int count) > { > struct sdhci_host *host; > int i, node; > + int failed = 0; > > debug("%s: count = %d\n", __func__, count); > > @@ -185,11 +186,18 @@ static int process_nodes(const void *blob, int node_list[], int count) > > if (sdhci_get_config(blob, node, host)) { > printf("%s: failed to decode dev %d\n", __func__, i); > - return -1; > + failed++; > + continue; > + } > + > + if (do_sdhci_init(host)) { > + printf("%s: failed to initialize dev %d\n", __func__, i); > + failed++; > } > - do_sdhci_init(host); > } > - return 0; > + > + /* we only consider it an error when all nodes fail */ > + return (failed == count ? -1 : 0); > } > > int exynos_mmc_init(const void *blob) > @@ -201,8 +209,6 @@ int exynos_mmc_init(const void *blob) > COMPAT_SAMSUNG_EXYNOS_MMC, node_list, > SDHCI_MAX_HOSTS); > > - process_nodes(blob, node_list, count); > - > - return 0; > + return process_nodes(blob, node_list, count); > } > #endif > Acked-by: Przemyslaw Marczak <p.marczak@samsung.com> Best regards,
diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c index e9c43a9..b461fde 100644 --- a/drivers/mmc/s5p_sdhci.c +++ b/drivers/mmc/s5p_sdhci.c @@ -172,6 +172,7 @@ static int process_nodes(const void *blob, int node_list[], int count) { struct sdhci_host *host; int i, node; + int failed = 0; debug("%s: count = %d\n", __func__, count); @@ -185,11 +186,18 @@ static int process_nodes(const void *blob, int node_list[], int count) if (sdhci_get_config(blob, node, host)) { printf("%s: failed to decode dev %d\n", __func__, i); - return -1; + failed++; + continue; + } + + if (do_sdhci_init(host)) { + printf("%s: failed to initialize dev %d\n", __func__, i); + failed++; } - do_sdhci_init(host); } - return 0; + + /* we only consider it an error when all nodes fail */ + return (failed == count ? -1 : 0); } int exynos_mmc_init(const void *blob) @@ -201,8 +209,6 @@ int exynos_mmc_init(const void *blob) COMPAT_SAMSUNG_EXYNOS_MMC, node_list, SDHCI_MAX_HOSTS); - process_nodes(blob, node_list, count); - - return 0; + return process_nodes(blob, node_list, count); } #endif
exynos_mmc_init() always returns zero, so for the caller it looks like it never fails. Correct this by returning the error code of process_nodes(). For process_nodes() do something similar and return early when do_sdhci_init() fails. v2: Only fail in process_nodes() if we fail on all available nodes. Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de> --- drivers/mmc/s5p_sdhci.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)