diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-04-15 20:16:12 +0900 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2016-05-02 10:33:31 +0200 |
| commit | 87e88659afd1dc17d123f5759184254897494579 (patch) | |
| tree | 08cfc3e2c7e818bf0b6c43c6492f554d07c7d8a6 /drivers/mmc | |
| parent | d97a1e5d7cd2b5b0edc02a40fe6897b710c9e10f (diff) | |
| download | op-kernel-dev-87e88659afd1dc17d123f5759184254897494579.zip op-kernel-dev-87e88659afd1dc17d123f5759184254897494579.tar.gz | |
mmc: core: drop unnecessary bit checking
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>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/core/mmc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index b8aa12c..28b477d 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 */ |
