From: Dirk Behme Date: Wed, 1 Nov 2006 19:51:35 +0000 (+0200) Subject: MMC: Fixing blksz_bits calling inside drivers/mmc/mmc.c and drivers/mmc/omap.c X-Git-Tag: v2.6.19-omap1~95 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=99c756f3bc19aca546a5e57eb8def598284dd2ab;p=linux-2.6-omap-h63xx.git MMC: Fixing blksz_bits calling inside drivers/mmc/mmc.c and drivers/mmc/omap.c Also fix warning: drivers/mmc/omap.c:587: warning: 'mmc_omap_switch_callback' defined but not used Signed-off-by: Dirk Behme Signed-off-by: Tony Lindgren --- diff --git a/drivers/mmc/omap.c b/drivers/mmc/omap.c index e2b1048dd38..f23a0ce8f87 100644 --- a/drivers/mmc/omap.c +++ b/drivers/mmc/omap.c @@ -581,12 +581,6 @@ static void mmc_omap_switch_timer(unsigned long arg) schedule_work(&host->switch_work); } -/* FIXME: Handle card insertion and removal properly. Maybe use a mask - * for MMC state? */ -static void mmc_omap_switch_callback(unsigned long data, u8 mmc_mask) -{ -} - static void mmc_omap_switch_handler(void *data) { struct mmc_omap_host *host = (struct mmc_omap_host *) data; @@ -633,10 +627,10 @@ mmc_omap_prepare_dma(struct mmc_omap_host *host, struct mmc_data *data) int sync_dev = 0; data_addr = host->phys_base + OMAP_MMC_REG_DATA; - frame = 1 << data->blksz_bits; + frame = data->blksz; count = sg_dma_len(sg); - if ((data->blocks == 1) && (count > (1 << data->blksz_bits))) + if ((data->blocks == 1) && (count > (data->blksz))) count = frame; host->dma_len = count; @@ -825,7 +819,7 @@ mmc_omap_prepare_data(struct mmc_omap_host *host, struct mmc_request *req) } - block_size = 1 << data->blksz_bits; + block_size = data->blksz; OMAP_MMC_WRITE(host, NBLK, data->blocks - 1); OMAP_MMC_WRITE(host, BLEN, block_size - 1);