Skip to contentSkip to conversation

: Fixing blksz_bits calling inside drivers/mmc/mmc.c and drivers/mmc/omap.c

PATCH In review Felipe Balbi 2 participants 7 messages Oct 27, 2006 MMC, SD and SDIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 : Fixing blksz_bits calling inside drivers/mmc/mmc.c and drivers/mmc/omap.c

This small patch solves the problem ;-)

Here's the error dump:
drivers/mmc/omap.c: In function 'mmc_omap_prepare_dma':
drivers/mmc/omap.c:636: error: 'struct mmc_data' has no member named 'blksz_bits' drivers/mmc/omap.c:639: error: 'struct mmc_data' has no member named 'blksz_bits' drivers/mmc/omap.c: In function 'mmc_omap_prepare_data':
drivers/mmc/omap.c:828: error: 'struct mmc_data' has no member named 'blksz_bits'

Obs: The same occurs for drivers/mmc/mmc.c file

Signature · 5 lines
Regards,

Felipe Balbi
[email protected]
OSMRC
drivers/mmc/omap.c +3 -3
Index: linux-omap/drivers/mmc/omap.c
===================================================================
@@ -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 = 1 << data->blksz;
 	count = sg_dma_len(sg);
 
-	if ((data->blocks == 1) && (count > (1 << data->blksz_bits)))
+	if ((data->blocks == 1) && (count > (1 << data->blksz)))
 		count = frame;
 
 	host->dma_len = count;
@@ -825,7 +825,7 @@ mmc_omap_prepare_data(struct mmc_omap_ho
 	}
 
 
-	block_size = 1 << data->blksz_bits;
+	block_size = 1 << data->blksz;
 
 	OMAP_MMC_WRITE(host, NBLK, data->blocks - 1);
 	OMAP_MMC_WRITE(host, BLEN, block_size - 1);
drivers/mmc/mmc.c +1 -1
@@ -996,7 +996,7 @@
 
 		mmc_set_data_timeout(&data, card, 0);
 
-		data.blksz = 1 << 3;
+		data.blksz_bits = 1 << 3;
 		data.blocks = 1;
 		data.flags = MMC_DATA_READ;
 		data.sg = &sg;
#1 lore raw
Quoted 44 lines · Felipe Balbi

This small patch solves the problem ;-)

Here's the error dump:
drivers/mmc/omap.c: In function 'mmc_omap_prepare_dma':
drivers/mmc/omap.c:636: error: 'struct mmc_data' has no member named 'blksz_bits' drivers/mmc/omap.c:639: error: 'struct mmc_data' has no member named 'blksz_bits' drivers/mmc/omap.c: In function 'mmc_omap_prepare_data':
drivers/mmc/omap.c:828: error: 'struct mmc_data' has no member named 'blksz_bits'

Obs: The same occurs for drivers/mmc/mmc.c file

------------------------------------------------------------------------

Index: linux-omap/drivers/mmc/omap.c
===================================================================

drivers/mmc/omap.c +3 -3
@@ -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 = 1 << data->blksz;
 	count = sg_dma_len(sg);
 
-	if ((data->blocks == 1) && (count > (1 << data->blksz_bits)))
+	if ((data->blocks == 1) && (count > (1 << data->blksz)))
 		count = frame;
 
 	host->dma_len = count;
@@ -825,7 +825,7 @@ mmc_omap_prepare_data(struct mmc_omap_ho
 	}
 
 
-	block_size = 1 << data->blksz_bits;
+	block_size = 1 << data->blksz;
 
 	OMAP_MMC_WRITE(host, NBLK, data->blocks - 1);
 	OMAP_MMC_WRITE(host, BLEN, block_size - 1);

drivers/mmc/mmc.c line 1002

Quoted 8 lines
drivers/mmc/mmc.c +1 -1
@@ -996,7 +996,7 @@
 
 		mmc_set_data_timeout(&data, card, 0);
 
-		data.blksz = 1 << 3;
+		data.blksz_bits = 1 << 3;
 		data.blocks = 1;
 		data.flags = MMC_DATA_READ;
 		data.sg = &sg;

This doesn't look correct to me (and compilation still fails). Why do you add data.blksz_bits in mmc.c again? It was removed by RMK at

http://source.mvista.com/git/gitweb.cgi?p=linux-omap-2.6.git;a=blobdiff;h=5b9caa7978d34311839840243e38921255f6da4b;hp=74eaaee66de0e59532ba5655fddac5aaeea5ba08;hb=132919ba80ad207755fe271277bfefff865a54fe;f=drivers/mmc/mmc.c

Whats about the attachment instead? It additionally removes warning

drivers/mmc/omap.c:587: warning: 'mmc_omap_switch_callback' defined but not used

too.

Signed-off-by Dirk Behme <dirk.behme_at_gmail.com>
drivers/mmc/omap.c +3 -9
Index: linux-osk/drivers/mmc/omap.c
===================================================================
@@ -581,12 +581,6 @@ static void mmc_omap_switch_timer(unsign
 	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_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;
@@ -825,7 +819,7 @@ mmc_omap_prepare_data(struct mmc_omap_ho
 	}
 
 
-	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);
#2 lore raw
Quoted 108 lines · ext Dirk Behme
Quoted 46 lines · Felipe Balbi

This small patch solves the problem ;-)

Here's the error dump:
drivers/mmc/omap.c: In function 'mmc_omap_prepare_dma':
drivers/mmc/omap.c:636: error: 'struct mmc_data' has no member named 'blksz_bits' drivers/mmc/omap.c:639: error: 'struct mmc_data' has no member named 'blksz_bits' drivers/mmc/omap.c: In function 'mmc_omap_prepare_data':
drivers/mmc/omap.c:828: error: 'struct mmc_data' has no member named 'blksz_bits'

Obs: The same occurs for drivers/mmc/mmc.c file

------------------------------------------------------------------------

Index: linux-omap/drivers/mmc/omap.c
===================================================================
--- linux-omap.orig/drivers/mmc/omap.c 2006-10-27
09:18:34.000000000 -0400
+++ linux-omap/drivers/mmc/omap.c 2006-10-27 11:03:14.000000000 -0400

drivers/mmc/omap.c +3 -3
@@ -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 = 1 << data->blksz;
     count = sg_dma_len(sg);
 
-    if ((data->blocks == 1) && (count > (1 << data->blksz_bits)))
+    if ((data->blocks == 1) && (count > (1 << data->blksz)))
         count = frame;
 
     host->dma_len = count;
@@ -825,7 +825,7 @@ mmc_omap_prepare_data(struct mmc_omap_ho
     }
 
 
-    block_size = 1 << data->blksz_bits;
+    block_size = 1 << data->blksz;
 
     OMAP_MMC_WRITE(host, NBLK, data->blocks - 1);
     OMAP_MMC_WRITE(host, BLEN, block_size - 1);
drivers/mmc/mmc.c 2006-10-26 09:53:24.000000000 renamed from drivers/mmc/mmc.c 2006-10-26 06:42:31.000000000 -0400 +0 -1
-0400

drivers/mmc/mmc.c 2006-10-26 09:53:24.000000000 line 1002

Quoted 8 lines
drivers/mmc/mmc.c 2006-10-26 09:53:24.000000000 renamed from drivers/mmc/mmc.c 2006-10-26 06:42:31.000000000 -0400 +1 -1
@@ -996,7 +996,7 @@
 
         mmc_set_data_timeout(&data, card, 0);
 
-        data.blksz = 1 << 3;
+        data.blksz_bits = 1 << 3;
         data.blocks = 1;
         data.flags = MMC_DATA_READ;
         data.sg = &sg;

This doesn't look correct to me (and compilation still fails). Why do you add data.blksz_bits in mmc.c again? It was removed by RMK at

http://source.mvista.com/git/gitweb.cgi?p=linux-omap-2.6.git;a=blobdiff;h=5b9caa7978d34311839840243e38921255f6da4b;hp=74eaaee66de0e59532ba5655fddac5aaeea5ba08;hb=132919ba80ad207755fe271277bfefff865a54fe;f=drivers/mmc/mmc.c

Whats about the attachment instead? It additionally removes warning

drivers/mmc/omap.c:587: warning: 'mmc_omap_switch_callback' defined but not used

too.

Signed-off-by: Dirk Behme <dirk.behme_at_gmail.com>
------------------------------------------------------------------------

Index: linux-osk/drivers/mmc/omap.c
===================================================================

drivers/mmc/omap.c +2 -8
@@ -581,12 +581,6 @@ static void mmc_omap_switch_timer(unsign
 	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_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;

drivers/mmc/omap.c mmc_omap_prepare_data(struct mmc_omap_ho · line 825

Quoted 8 lines
drivers/mmc/omap.c +1 -1
@@ -825,7 +819,7 @@ mmc_omap_prepare_data(struct mmc_omap_ho
 	}
 
 
-	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);

But then you will need to modify the struct mmc_data... and that didn't seem correct for me 'cause every module using this structure (and probable future modules) would need to modify the same way you did...

Signature · 5 lines
Regards,

Felipe Balbi
[email protected]
OSMRC
#3 lore raw

I just saw an error in the patch generation...

(...)

drivers/mmc/mmc.c +0 -0
@@ -996,7 +996,7 @@
 
		mmc_set_data_timeout(&data, card, 0);

- data.blksz = 1 << 3;

+		data.blksz_bits = 1 << 3;
		data.blocks = 1;
		data.flags = MMC_DATA_READ;
		data.sg = &sg;

The module should actually be inverted here... just like:

(...)

drivers/mmc/mmc.c +0 -0
@@ -996,7 +996,7 @@
 
		mmc_set_data_timeout(&data, card, 0);

- data.blksz_bits = 1 << 3;

+		data.blksz = 1 << 3;
		data.blocks = 1;
		data.flags = MMC_DATA_READ;
		data.sg = &sg;

I look at my quilt "repository" and the patch is ok... Don't know how that happened.

Quoted 121 lines · ext Felipe Balbi
Quoted 110 lines · ext Dirk Behme
Quoted 48 lines · Felipe Balbi

This small patch solves the problem ;-)

Here's the error dump:
drivers/mmc/omap.c: In function 'mmc_omap_prepare_dma':
drivers/mmc/omap.c:636: error: 'struct mmc_data' has no member named 'blksz_bits' drivers/mmc/omap.c:639: error: 'struct mmc_data' has no member named 'blksz_bits' drivers/mmc/omap.c: In function 'mmc_omap_prepare_data':
drivers/mmc/omap.c:828: error: 'struct mmc_data' has no member named 'blksz_bits'

Obs: The same occurs for drivers/mmc/mmc.c file

------------------------------------------------------------------------

Index: linux-omap/drivers/mmc/omap.c
===================================================================
--- linux-omap.orig/drivers/mmc/omap.c 2006-10-27
09:18:34.000000000 -0400
+++ linux-omap/drivers/mmc/omap.c 2006-10-27 11:03:14.000000000
-0400

(quoted diff) +3 -3
@@ -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 = 1 << data->blksz;
     count = sg_dma_len(sg);
 
-    if ((data->blocks == 1) && (count > (1 << data->blksz_bits)))
+    if ((data->blocks == 1) && (count > (1 << data->blksz)))
         count = frame;
 
     host->dma_len = count;
@@ -825,7 +825,7 @@ mmc_omap_prepare_data(struct mmc_omap_ho
     }
 
 
-    block_size = 1 << data->blksz_bits;
+    block_size = 1 << data->blksz;
 
     OMAP_MMC_WRITE(host, NBLK, data->blocks - 1);
     OMAP_MMC_WRITE(host, BLEN, block_size - 1);
drivers/mmc/mmc.c 2006-10-26 renamed from drivers/mmc/mmc.c 2006-10-26 06:42:31.000000000 -0400 +0 -0

09:53:24.000000000 -0400

drivers/mmc/mmc.c 2006-10-26 line 1002

Quoted 8 lines
drivers/mmc/mmc.c 2006-10-26 renamed from drivers/mmc/mmc.c 2006-10-26 06:42:31.000000000 -0400 +1 -1
@@ -996,7 +996,7 @@
 
         mmc_set_data_timeout(&data, card, 0);
 
-        data.blksz = 1 << 3;
+        data.blksz_bits = 1 << 3;
         data.blocks = 1;
         data.flags = MMC_DATA_READ;
         data.sg = &sg;

This doesn't look correct to me (and compilation still fails). Why do you add data.blksz_bits in mmc.c again? It was removed by RMK at

http://source.mvista.com/git/gitweb.cgi?p=linux-omap-2.6.git;a=blobdiff;h=5b9caa7978d34311839840243e38921255f6da4b;hp=74eaaee66de0e59532ba5655fddac5aaeea5ba08;hb=132919ba80ad207755fe271277bfefff865a54fe;f=drivers/mmc/mmc.c

Whats about the attachment instead? It additionally removes warning

drivers/mmc/omap.c:587: warning: 'mmc_omap_switch_callback' defined but not used

too.

Signed-off-by: Dirk Behme <dirk.behme_at_gmail.com>
------------------------------------------------------------------------

Index: linux-osk/drivers/mmc/omap.c
===================================================================

drivers/mmc/omap.c +2 -8
@@ -581,12 +581,6 @@ static void mmc_omap_switch_timer(unsign
     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_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;

drivers/mmc/omap.c mmc_omap_prepare_data(struct mmc_omap_ho · line 825

Quoted 8 lines
drivers/mmc/omap.c +1 -1
@@ -825,7 +819,7 @@ mmc_omap_prepare_data(struct mmc_omap_ho
     }
 
 
-    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);

But then you will need to modify the struct mmc_data... and that didn't seem correct for me 'cause every module using this structure (and probable future modules) would need to modify the same way you did...

Signature · 5 lines
Regards,

Felipe Balbi
[email protected]
OSMRC
#4 lore raw
In reply to Felipe Balbi
Quoted 97 lines · Felipe Balbi
Quoted 97 lines
Quoted 32 lines

Index: linux-omap/drivers/mmc/omap.c
===================================================================
--- linux-omap.orig/drivers/mmc/omap.c 2006-10-27
09:18:34.000000000 -0400
+++ linux-omap/drivers/mmc/omap.c 2006-10-27 11:03:14.000000000 -0400

drivers/mmc/omap.c +3 -3
@@ -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 = 1 << data->blksz;
     count = sg_dma_len(sg);
 
-    if ((data->blocks == 1) && (count > (1 << data->blksz_bits)))
+    if ((data->blocks == 1) && (count > (1 << data->blksz)))
         count = frame;
 
     host->dma_len = count;
@@ -825,7 +825,7 @@ mmc_omap_prepare_data(struct mmc_omap_ho
     }
 
 
-    block_size = 1 << data->blksz_bits;
+    block_size = 1 << data->blksz;
 
     OMAP_MMC_WRITE(host, NBLK, data->blocks - 1);
     OMAP_MMC_WRITE(host, BLEN, block_size - 1);
drivers/mmc/mmc.c 2006-10-26 09:53:24.000000000 renamed from drivers/mmc/mmc.c 2006-10-26 06:42:31.000000000 -0400 +0 -1
-0400

drivers/mmc/mmc.c 2006-10-26 09:53:24.000000000 line 1002

Quoted 8 lines
drivers/mmc/mmc.c 2006-10-26 09:53:24.000000000 renamed from drivers/mmc/mmc.c 2006-10-26 06:42:31.000000000 -0400 +1 -1
@@ -996,7 +996,7 @@
 
         mmc_set_data_timeout(&data, card, 0);
 
-        data.blksz = 1 << 3;
+        data.blksz_bits = 1 << 3;
         data.blocks = 1;
         data.flags = MMC_DATA_READ;
         data.sg = &sg;

This doesn't look correct to me (and compilation still fails). Why do you add data.blksz_bits in mmc.c again? It was removed by RMK at

http://source.mvista.com/git/gitweb.cgi?p=linux-omap-2.6.git;a=blobdiff;h=5b9caa7978d34311839840243e38921255f6da4b;hp=74eaaee66de0e59532ba5655fddac5aaeea5ba08;hb=132919ba80ad207755fe271277bfefff865a54fe;f=drivers/mmc/mmc.c

Whats about the attachment instead? It additionally removes warning

drivers/mmc/omap.c:587: warning: 'mmc_omap_switch_callback' defined but not used

too.

Signed-off-by: Dirk Behme <dirk.behme_at_gmail.com>
------------------------------------------------------------------------

Index: linux-osk/drivers/mmc/omap.c
===================================================================

drivers/mmc/omap.c +3 -9
@@ -581,12 +581,6 @@ static void mmc_omap_switch_timer(unsign
     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_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;
@@ -825,7 +819,7 @@ mmc_omap_prepare_data(struct mmc_omap_ho
     }
 
 
-    block_size = 1 << data->blksz_bits;
+    block_size = data->blksz;
 
Quoted 7 lines

drivers/mmc/omap.c mmc_omap_prepare_data(struct mmc_omap_ho · line 825

Quoted 5 lines
drivers/mmc/omap.c +0 -0
     OMAP_MMC_WRITE(host, NBLK, data->blocks - 1);
     OMAP_MMC_WRITE(host, BLEN, block_size - 1);

But then you will need to modify the struct mmc_data...

Mmh, why? Above patch compiles for me.

blksz is part of the global struct mmc_data, isn't it?

http://source.mvista.com/git/gitweb.cgi?p=linux-omap-2.6.git;a=commitdiff;h=132919ba80ad207755fe271277bfefff865a54fe

http://source.mvista.com/git/gitweb.cgi?p=linux-omap-2.6.git;a=commit;h=132919ba80ad207755fe271277bfefff865a54fe

Do we both talk about recent git? Or do you use an other or locally modified version?

Best regards

Dirk

#5 lore raw
Quoted 116 lines · ext Dirk Behme
Quoted 100 lines · Felipe Balbi
Quoted 100 lines
Quoted 34 lines

Index: linux-omap/drivers/mmc/omap.c
===================================================================
--- linux-omap.orig/drivers/mmc/omap.c 2006-10-27
09:18:34.000000000 -0400
+++ linux-omap/drivers/mmc/omap.c 2006-10-27 11:03:14.000000000
-0400

(quoted diff) +4 -5
@@ -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 = 1 << data->blksz;
     count = sg_dma_len(sg);
 
-    if ((data->blocks == 1) && (count > (1 << data->blksz_bits)))
+    if ((data->blocks == 1) && (count > (1 << data->blksz)))
         count = frame;
 
     host->dma_len = count;
@@ -825,7 +825,7 @@ mmc_omap_prepare_data(struct mmc_omap_ho
     }
 
 
-    block_size = 1 << data->blksz_bits;
+    block_size = 1 << data->blksz;
 
     OMAP_MMC_WRITE(host, NBLK, data->blocks - 1);
     OMAP_MMC_WRITE(host, BLEN, block_size - 1);
 
--- linux-omap/drivers/mmc/mmc.c    2006-10-26 06:42:31.000000000 
-0400
+++ linux-omap-dev/drivers/mmc/mmc.c    2006-10-26 

09:53:24.000000000 -0400

Review line 1002

Quoted 8 lines
(quoted diff) +1 -1
@@ -996,7 +996,7 @@
 
         mmc_set_data_timeout(&data, card, 0);
 
-        data.blksz = 1 << 3;
+        data.blksz_bits = 1 << 3;
         data.blocks = 1;
         data.flags = MMC_DATA_READ;
         data.sg = &sg;

This doesn't look correct to me (and compilation still fails). Why do you add data.blksz_bits in mmc.c again? It was removed by RMK at

http://source.mvista.com/git/gitweb.cgi?p=linux-omap-2.6.git;a=blobdiff;h=5b9caa7978d34311839840243e38921255f6da4b;hp=74eaaee66de0e59532ba5655fddac5aaeea5ba08;hb=132919ba80ad207755fe271277bfefff865a54fe;f=drivers/mmc/mmc.c

Whats about the attachment instead? It additionally removes warning

drivers/mmc/omap.c:587: warning: 'mmc_omap_switch_callback' defined but not used

too.

Signed-off-by: Dirk Behme <dirk.behme_at_gmail.com>
------------------------------------------------------------------------

Index: linux-osk/drivers/mmc/omap.c
===================================================================

drivers/mmc/omap.c +3 -9
@@ -581,12 +581,6 @@ static void mmc_omap_switch_timer(unsign
     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_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;
@@ -825,7 +819,7 @@ mmc_omap_prepare_data(struct mmc_omap_ho
     }
 
 
-    block_size = 1 << data->blksz_bits;
+    block_size = data->blksz;
 
Quoted 7 lines

drivers/mmc/omap.c mmc_omap_prepare_data(struct mmc_omap_ho · line 825

Quoted 5 lines
drivers/mmc/omap.c +0 -0
     OMAP_MMC_WRITE(host, NBLK, data->blocks - 1);
     OMAP_MMC_WRITE(host, BLEN, block_size - 1);

But then you will need to modify the struct mmc_data...

Mmh, why? Above patch compiles for me.

blksz is part of the global struct mmc_data, isn't it?

http://source.mvista.com/git/gitweb.cgi?p=linux-omap-2.6.git;a=commitdiff;h=132919ba80ad207755fe271277bfefff865a54fe

Quoted 9 lines

http://source.mvista.com/git/gitweb.cgi?p=linux-omap-2.6.git;a=commit;h=132919ba80ad207755fe271277bfefff865a54fe

Do we both talk about recent git? Or do you use an other or locally modified version?

Best regards

Dirk

Yep, my git tree is the newest version...
And I made a mistake here...

drivers/mmc/mmc.c 2006-10-26 09:53:24.000000000 -0400 renamed from drivers/mmc/mmc.c 2006-10-26 06:42:31.000000000 -0400 +1 -1
@@ -996,7 +996,7 @@
 
        mmc_set_data_timeout(&data, card, 0);
 
-        data.blksz = 1 << 3;
+        data.blksz_bits = 1 << 3;
        data.blocks = 1;
        data.flags = MMC_DATA_READ;
        data.sg = &sg;

It's deordered... it should appear like:

drivers/mmc/mmc.c 2006-10-26 09:53:24.000000000 -0400 renamed from drivers/mmc/mmc.c 2006-10-26 06:42:31.000000000 -0400 +1 -1
@@ -996,7 +996,7 @@
 
        mmc_set_data_timeout(&data, card, 0);
 
-        data.blksz_bits = 1 << 3;
+        data.blksz = 1 << 3;
        data.blocks = 1;
        data.flags = MMC_DATA_READ;
        data.sg = &sg;
Signature · 5 lines
Best Regards,

Felipe Balbi
[email protected]
OSMRC
#6 lore raw
Quoted 41 lines · Felipe Balbi
Quoted 40 lines · ext Dirk Behme
Quoted 40 lines
Quoted 40 lines

Index: linux-osk/drivers/mmc/omap.c
===================================================================

drivers/mmc/omap.c +3 -9
@@ -581,12 +581,6 @@ static void mmc_omap_switch_timer(unsign
     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_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;
@@ -825,7 +819,7 @@ mmc_omap_prepare_data(struct mmc_omap_ho
     }
 
 
-    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);

...

Quoted 1 line

Yep, my git tree is the newest version...

...

drivers/mmc/mmc.c 2006-10-26 09:53:24.000000000 -0400 line 1002

Quoted 11 lines
drivers/mmc/mmc.c 2006-10-26 09:53:24.000000000 -0400 renamed from drivers/mmc/mmc.c 2006-10-26 06:42:31.000000000 -0400 +1 -1
@@ -996,7 +996,7 @@
 
        mmc_set_data_timeout(&data, card, 0);
 
-        data.blksz_bits = 1 << 3;
+        data.blksz = 1 << 3;
        data.blocks = 1;
        data.flags = MMC_DATA_READ;
        data.sg = &sg;

Weird. My drivers/mmc/mmc.c looks

...
mmc_set_data_timeout(&data, card, 0);

data.blksz = 1 << 3;
data.blocks = 1;
data.flags = MMC_DATA_READ;
data.sg = &sg;
data.sg_len = 1;
...

without any patch. Looking at line ~999 of

http://source.mvista.com/git/gitweb.cgi?p=linux-omap-2.6.git;a=blob;h=ee8863c123e37881e0f35ee658a15fd5e925ad31;hb=591db7639fd7e2b2ae3f82851ee1d25beac714c4;f=drivers/mmc/mmc.c#999

it's the same. So I don't have to touch mmc.c for my patch above.

Best regards

Dirk