aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/mmc
diff options
context:
space:
mode:
authorDavid Vrabel <david.vrabel@csr.com>2007-08-08 09:23:48 -0400
committerPierre Ossman <drzeus@drzeus.cx>2007-09-23 15:19:26 -0400
commit9a08f82b3cc522f727ace580a2aaee5402435bc8 (patch)
tree81818bba503a469184883b0ea8c436b9ce97aa0f /include/linux/mmc
parent7616ee95f27a04fd5a6434e9ef4a82cec4b2807c (diff)
sdio: set the functions' block size
Before a driver is probed, set the function's block size to the default so the driver is sure the block size is something sensible and it needn't explicitly set it. The default block size is the largest that's supported by both the card and the host, with a maximum of 512 to ensure aribitrarily sized transfer use the optimal (least) number of commands. See http://lkml.org/lkml/2007/8/7/150 for reasons for the block size choice. Signed-off-by: David Vrabel <david.vrabel@csr.com> Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'include/linux/mmc')
-rw-r--r--include/linux/mmc/sdio_func.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/mmc/sdio_func.h b/include/linux/mmc/sdio_func.h
index af813fffc4ac..f05757984e8d 100644
--- a/include/linux/mmc/sdio_func.h
+++ b/include/linux/mmc/sdio_func.h
@@ -43,7 +43,8 @@ struct sdio_func {
43 unsigned short vendor; /* vendor id */ 43 unsigned short vendor; /* vendor id */
44 unsigned short device; /* device id */ 44 unsigned short device; /* device id */
45 45
46 unsigned short blksize; /* maximum block size */ 46 unsigned max_blksize; /* maximum block size */
47 unsigned cur_blksize; /* current block size */
47 48
48 unsigned int state; /* function state */ 49 unsigned int state; /* function state */
49#define SDIO_STATE_PRESENT (1<<0) /* present in sysfs */ 50#define SDIO_STATE_PRESENT (1<<0) /* present in sysfs */
@@ -111,6 +112,8 @@ extern void sdio_release_host(struct sdio_func *func);
111extern int sdio_enable_func(struct sdio_func *func); 112extern int sdio_enable_func(struct sdio_func *func);
112extern int sdio_disable_func(struct sdio_func *func); 113extern int sdio_disable_func(struct sdio_func *func);
113 114
115extern int sdio_set_block_size(struct sdio_func *func, unsigned blksz);
116
114extern int sdio_claim_irq(struct sdio_func *func, sdio_irq_handler_t *handler); 117extern int sdio_claim_irq(struct sdio_func *func, sdio_irq_handler_t *handler);
115extern int sdio_release_irq(struct sdio_func *func); 118extern int sdio_release_irq(struct sdio_func *func);
116 119