public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Lukasz Majewski <lukma@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] spl: mmc: Fix indentation in spl_mmc.c file
Date: Wed, 9 Oct 2019 11:04:57 +0200	[thread overview]
Message-ID: <20191009110457.0b63324d@jawa> (raw)
In-Reply-To: <20190903141717.5280-1-lukma@denx.de>

Dear Tom,

> From: Mans Rullgard <mans@mansr.com>
> 
> This fixes a wrongly indented block of code.
> 
> Signed-off-by: Mans Rullgard <mans@mansr.com>
> [lukma: Make the commit message more verbose]
> Signed-off-by: Lukasz Majewski <lukma@denx.de>
> 

Tom, are there any issues preventing this patch from being applied to
-master?

> ---
> 
>  common/spl/spl_mmc.c | 40 ++++++++++++++++++++--------------------
>  1 file changed, 20 insertions(+), 20 deletions(-)
> 
> diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
> index b3619889f7..2caceb5186 100644
> --- a/common/spl/spl_mmc.c
> +++ b/common/spl/spl_mmc.c
> @@ -334,28 +334,28 @@ int spl_mmc_load(struct spl_image_info
> *spl_image, err = -EINVAL;
>  	switch (boot_mode) {
>  	case MMCSD_MODE_EMMCBOOT:
> -			/*
> -			 * We need to check what the partition is
> configured to.
> -			 * 1 and 2 match up to boot0 / boot1 and 7
> is user data
> -			 * which is the first physical partition (0).
> -			 */
> -			part = (mmc->part_config >> 3) &
> PART_ACCESS_MASK; -
> -			if (part == 7)
> -				part = 0;
> -
> -			if (CONFIG_IS_ENABLED(MMC_TINY))
> -				err = mmc_switch_part(mmc, part);
> -			else
> -				err =
> blk_dselect_hwpart(mmc_get_blk_desc(mmc), part); -
> -			if (err) {
> +		/*
> +		 * We need to check what the partition is configured
> to.
> +		 * 1 and 2 match up to boot0 / boot1 and 7 is user
> data
> +		 * which is the first physical partition (0).
> +		 */
> +		part = (mmc->part_config >> 3) & PART_ACCESS_MASK;
> +
> +		if (part == 7)
> +			part = 0;
> +
> +		if (CONFIG_IS_ENABLED(MMC_TINY))
> +			err = mmc_switch_part(mmc, part);
> +		else
> +			err =
> blk_dselect_hwpart(mmc_get_blk_desc(mmc), part); +
> +		if (err) {
>  #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
> -				puts("spl: mmc partition switch
> failed\n");
> +			puts("spl: mmc partition switch failed\n");
>  #endif
> -				return err;
> -			}
> -			/* Fall through */
> +			return err;
> +		}
> +		/* Fall through */
>  	case MMCSD_MODE_RAW:
>  		debug("spl: mmc boot mode: raw\n");
>  




Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191009/aa147915/attachment.sig>

  reply	other threads:[~2019-10-09  9:04 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-03 14:17 [U-Boot] [PATCH] spl: mmc: Fix indentation in spl_mmc.c file Lukasz Majewski
2019-10-09  9:04 ` Lukasz Majewski [this message]
2019-10-12 20:23 ` Tom Rini

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=20191009110457.0b63324d@jawa \
    --to=lukma@denx.de \
    --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