diff mbox

mmc: drop unnecessary bit checking

Message ID 1460718972-17306-1-git-send-email-yamada.masahiro@socionext.com (mailing list archive)
State New, archived
Headers show

Commit Message

Masahiro Yamada April 15, 2016, 11:16 a.m. UTC
This if-block is going to call mmc_card_set_blockaddr(), so
mmc_card_blockaddr() right before it is redundant.

I am fixing the block comment style while I am here.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 drivers/mmc/core/mmc.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Ulf Hansson April 18, 2016, 11:21 a.m. UTC | #1
On 15 April 2016 at 13:16, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> This if-block is going to call mmc_card_set_blockaddr(), so
> mmc_card_blockaddr() right before it is redundant.
>
> I am fixing the block comment style while I am here.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Thanks, applied for next!

Kind regards
Uffe

> ---
>
>  drivers/mmc/core/mmc.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
> index 4dbe3df..c96bc81 100644
> --- a/drivers/mmc/core/mmc.c
> +++ b/drivers/mmc/core/mmc.c
> @@ -1483,12 +1483,13 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
>                 if (err)
>                         goto free_card;
>
> -               /* If doing byte addressing, check if required to do sector
> +               /*
> +                * If doing byte addressing, check if required to do sector
>                  * addressing.  Handle the case of <2GB cards needing sector
>                  * addressing.  See section 8.1 JEDEC Standard JED84-A441;
>                  * ocr register has bit 30 set for sector addressing.
>                  */
> -               if (!(mmc_card_blockaddr(card)) && (rocr & (1<<30)))
> +               if (rocr & BIT(30))
>                         mmc_card_set_blockaddr(card);
>
>                 /* Erase size depends on CSD and Extended CSD */
> --
> 1.9.1
>
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 4dbe3df..c96bc81 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1483,12 +1483,13 @@  static int mmc_init_card(struct mmc_host *host, u32 ocr,
 		if (err)
 			goto free_card;
 
-		/* If doing byte addressing, check if required to do sector
+		/*
+		 * If doing byte addressing, check if required to do sector
 		 * addressing.  Handle the case of <2GB cards needing sector
 		 * addressing.  See section 8.1 JEDEC Standard JED84-A441;
 		 * ocr register has bit 30 set for sector addressing.
 		 */
-		if (!(mmc_card_blockaddr(card)) && (rocr & (1<<30)))
+		if (rocr & BIT(30))
 			mmc_card_set_blockaddr(card);
 
 		/* Erase size depends on CSD and Extended CSD */