mmc: fix non-arm build due to eMMC 4.3+ change
authorOlof Johansson <olof@lixom.net>
Wed, 28 Jul 2010 04:11:15 +0000 (23:11 -0500)
committerColin Cross <ccross@android.com>
Wed, 6 Oct 2010 23:28:10 +0000 (16:28 -0700)
drivers/mmc/core/mmc.c:228: error: ‘SZ_256K’ undeclared (first use in this function)

Introduced by:
    mmc: subtract boot sectors from disk size for eMMC 4.3+ devices

(SZ_* doesn't exist on anything but arm)

Change-Id: I981217adea4ef56bf870562b6711488f3f4bf830
Signed-off-by: Olof Johansson <olof@lixom.net>
drivers/mmc/core/mmc.c

index f5b2aaf2371f1f3d854212e6d9ac62bf6786ddcf..45055c46d954957be5a49196c80be2b21ae6c7a3 100644 (file)
@@ -255,8 +255,8 @@ static int mmc_read_ext_csd(struct mmc_card *card)
                /* Cards with density > 2GiB are sector addressed */
                if (card->ext_csd.sectors > (2u * 1024 * 1024 * 1024) / 512) {
                        unsigned boot_sectors;
-                       boot_sectors = ext_csd[EXT_CSD_BOOT_SIZE_MULTI];
-                       boot_sectors *= SZ_256K / 512;
+                       /* size is in 256K chunks, i.e. 512 sectors each */
+                       boot_sectors = ext_csd[EXT_CSD_BOOT_SIZE_MULTI] * 512;
                        card->ext_csd.sectors -= boot_sectors;
                        mmc_card_set_blockaddr(card);
                }