public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Przemyslaw Marczak <p.marczak@samsung.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 2/4] exynos: Fix passing of errors in exynos_mmc_init()
Date: Mon, 28 Sep 2015 19:22:04 +0200	[thread overview]
Message-ID: <5609773C.8050604@samsung.com> (raw)
In-Reply-To: <1443201500-9256-2-git-send-email-tjakobi@math.uni-bielefeld.de>

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,
-- 
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com

  reply	other threads:[~2015-09-28 17:22 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-25 17:18 [U-Boot] [PATCH v2 1/4] exynos: Properly initialize host_caps in s5p_sdhci_core_init() Tobias Jakobi
2015-09-25 17:18 ` [U-Boot] [PATCH v2 2/4] exynos: Fix passing of errors in exynos_mmc_init() Tobias Jakobi
2015-09-28 17:22   ` Przemyslaw Marczak [this message]
2015-09-25 17:18 ` [U-Boot] [PATCH v2 3/4] exynos: be more verbose in process_nodes() Tobias Jakobi
2015-09-28 17:22   ` Przemyslaw Marczak
2015-09-25 17:18 ` [U-Boot] [PATCH v2 4/4] exynos: more debug and cleanup in do_sdhci_init() Tobias Jakobi
2015-09-28 17:22   ` Przemyslaw Marczak
2015-09-28 17:21 ` [U-Boot] [PATCH v2 1/4] exynos: Properly initialize host_caps in s5p_sdhci_core_init() Przemyslaw Marczak

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5609773C.8050604@samsung.com \
    --to=p.marczak@samsung.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox