sdio: add SDIO_FBR_BASE(f) macro

Signed-off-by: David Vrabel <david.vrabel@csr.com>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>

2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index 48c465a8e34e..58cf36e44678 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -30,7 +30,7 @@ static int sdio_read_fbr(struct sdio_func *func)
         unsigned char data;
 
         ret = mmc_io_rw_direct(func->card, 0, 0,
-                func->num * 0x100 + SDIO_FBR_STD_IF, 0, &data);
+                SDIO_FBR_BASE(func->num) + SDIO_FBR_STD_IF, 0, &data);
         if (ret)
                 goto out;
 
@@ -38,7 +38,7 @@ static int sdio_read_fbr(struct sdio_func *func)
 
         if (data == 0x0f) {
                 ret = mmc_io_rw_direct(func->card, 0, 0,
-                        func->num * 0x100 + SDIO_FBR_STD_IF_EXT, 0, &data);
+                        SDIO_FBR_BASE(func->num) + SDIO_FBR_STD_IF_EXT, 0, &data);
                 if (ret)
                         goto out;
         }
diff --git a/drivers/mmc/core/sdio_cis.c b/drivers/mmc/core/sdio_cis.c
index ec806a1229b6..d050c40cf046 100644
--- a/drivers/mmc/core/sdio_cis.c
+++ b/drivers/mmc/core/sdio_cis.c
@@ -145,7 +145,7 @@ static int sdio_read_cis(struct mmc_card *card, struct sdio_func *func)
                         fn = 0;
 
                 ret = mmc_io_rw_direct(card, 0, 0,
-                                       fn * 0x100 + SDIO_FBR_CIS + i, 0, &x);
+                        SDIO_FBR_BASE(fn) + SDIO_FBR_CIS + i, 0, &x);
                 if (ret)
                         return ret;
                 ptr |= x << (i * 8);