[PATCH] Replace data->blksz_bits member by data->blksz in omap.c

[Carlos Aguiar <carlos.aguiar@indt.org.br>]

[-- Attachment #1: Type: text/plain, Size: 396 bytes --]

Hi Tony and folks,

This patch replace data->blksz_bits member by data->blksz in omap.c
file. data->blksz_bits
member is unused now.

This is need in order to align omap.c code from Linux-OMAP with mainline.

BR,

Carlos.

-- 
Carlos Eduardo
Nokia Institute of Technology - INdT
Embedded Linux Laboratory - 10LE
Phone: +55 92 2126-1079
Mobile: +55 92 8127-1797
E-mail: carlos.aguiar@indt.org.br


[-- Attachment #2: mmc_omap_replace_member.diff --]
[-- Type: text/plain, Size: 1037 bytes --]

Replace data->blksz_bits by data->blksz. data->blksz_bits member is unused now.

Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar <at> indt.org.br>

Index: linux-omap-git/drivers/mmc/omap.c
===================================================================
--- linux-omap-git.orig/drivers/mmc/omap.c	2006-10-30 09:36:23.000000000 -0400
+++ linux-omap-git/drivers/mmc/omap.c	2006-10-30 10:11:29.000000000 -0400
@@ -633,10 +633,10 @@ mmc_omap_prepare_dma(struct mmc_omap_hos
 	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;
@@ -824,8 +824,7 @@ mmc_omap_prepare_data(struct mmc_omap_ho
 		return;
 	}
 
-
-	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);

[-- Attachment #3: Type: text/plain, Size: 0 bytes --]