Signed-off-by: David Vrabel <[EMAIL PROTECTED]>
---
commit 51755c3d59be1ba778bef45888f9f5e341dc4af4
tree c7bbb562b2d801197eefb619a17c94467c1299cd
parent 1cf0b6019aa3916197eecafe058bd2f3d700d24a
author David Vrabel <[EMAIL PROTECTED]> Mon, 30 Jul 2007 19:20:59 +0100
committer David Vrabel <[EMAIL PROTECTED]> Mon, 30 Jul 2007 19:28:30 +0100
drivers/mmc/core/sdio.c | 4 ++--
drivers/mmc/core/sdio_cis.c | 2 +-
include/linux/mmc/sdio.h | 16 +++++++++-------
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index 6589fd6..08f579c 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_STD_IF(func->num), 0, &data);
if (ret != MMC_ERR_NONE)
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_STD_IF_EXT(func->num), 0, &data);
if (ret != MMC_ERR_NONE)
goto out;
}
diff --git a/drivers/mmc/core/sdio_cis.c b/drivers/mmc/core/sdio_cis.c
index b0c6697..8aa4666 100644
--- a/drivers/mmc/core/sdio_cis.c
+++ b/drivers/mmc/core/sdio_cis.c
@@ -215,7 +215,7 @@ int sdio_read_cis(struct sdio_func *func, unsigned int fn)
for (i = 0; i < 3; i++) {
unsigned char x;
ret = mmc_io_rw_direct(func->card, 0, 0,
- fn * 0x100 + SDIO_FBR_CIS + i, 0, &x);
+ SDIO_FBR_CIS(fn) + i, 0, &x);
if (ret != MMC_ERR_NONE)
return -EIO;
ptr |= x << (i * 8);
diff --git a/include/linux/mmc/sdio.h b/include/linux/mmc/sdio.h
index 145ce23..e2bda4b 100644
--- a/include/linux/mmc/sdio.h
+++ b/include/linux/mmc/sdio.h
@@ -132,26 +132,28 @@
* Function Basic Registers (FBR)
*/
-#define SDIO_FBR_STD_IF 0x00
+#define __SDIO_FBR(f, r) ((f) * 0x100 + (r))
+
+#define SDIO_FBR_STD_IF(f) __SDIO_FBR((f), 0x00)
#define SDIO_FBR_SUPPORTS_CSA 0x40 /* supports Code Storage Area */
#define SDIO_FBR_ENABLE_CSA 0x80 /* enable Code Storage Area */
-#define SDIO_FBR_STD_IF_EXT 0x01
+#define SDIO_FBR_STD_IF_EXT(f) __SDIO_FBR((f), 0x01)
-#define SDIO_FBR_POWER 0x02
+#define SDIO_FBR_POWER(f) __SDIO_FBR((f), 0x02)
#define SDIO_FBR_POWER_SPS 0x01 /* Supports Power Selection */
#define SDIO_FBR_POWER_EPS 0x02 /* Enable (low) Power Selection */
-#define SDIO_FBR_CIS 0x09 /* CIS pointer (3 bytes) */
+#define SDIO_FBR_CIS(f) __SDIO_FBR((f), 0x09) /* CIS pointer (3
bytes) */
-#define SDIO_FBR_CSA 0x0C /* CSA pointer (3 bytes) */
+#define SDIO_FBR_CSA(f) __SDIO_FBR((f), 0x0C) /* CSA pointer (3
bytes) */
-#define SDIO_FBR_CSA_DATA 0x0F
+#define SDIO_FBR_CSA_DATA(f) __SDIO_FBR((f), 0x0F)
-#define SDIO_FBR_BLKSIZE 0x10 /* block size (2 bytes) */
+#define SDIO_FBR_BLKSIZE(f) __SDIO_FBR((f), 0x10) /* block size (2 bytes) */
#endif
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
