Skip to contentSkip to conversation

TI: DaVinci DM355: Fix Compilation warning

PATCH New s-paulraj at ti.com 2 participants 2 messages Sep 29, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 TI: DaVinci DM355: Fix Compilation warning

From: Sandeep Paulraj <[email protected]>

This patch fixes a compilation warning while building DM355

---
 board/davinci/dm355evm/dm355evm.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
board/davinci/dm355evm/dm355evm.c +4 -4
index 0a44748..5dd3b0d 100644
@@ -96,11 +96,11 @@ static void nand_dm355evm_select_chip(struct mtd_info *mtd, int chip)
 	u32			rbase = (u32) this->IO_ADDR_R;
 
 	if (chip == 1) {
-		__set_bit(14, &wbase);
-		__set_bit(14, &rbase);
+		__set_bit(14, (void *)&wbase);
+		__set_bit(14, (void *)&rbase);
 	} else {
-		__clear_bit(14, &wbase);
-		__clear_bit(14, &rbase);
+		__clear_bit(14, (void *)&wbase);
+		__clear_bit(14, (void *)&rbase);
 	}
 	this->IO_ADDR_W = (void *)wbase;
 	this->IO_ADDR_R = (void *)rbase;
Signature · 1 line
1.6.0.4
#1 lore raw

PATCH 1/1 TI: DaVinci DM355: Fix Compilation warning

Quoted 19 lines · s-paulraj at ti.com

From: Sandeep Paulraj <[email protected]>

This patch fixes a compilation warning while building DM355

---
 board/davinci/dm355evm/dm355evm.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
board/davinci/dm355evm/dm355evm.c +0 -2
index 0a44748..5dd3b0d 100644
@@ -96,11 +96,11 @@ static void nand_dm355evm_select_chip(struct mtd_info *mtd, int chip)
 	u32			rbase = (u32) this->IO_ADDR_R;
 
 	if (chip == 1) {
-		__set_bit(14, &wbase);
-		__set_bit(14, &rbase);

board/davinci/dm355evm/dm355evm.c static void nand_dm355evm_select_chip(struct mtd_info *mtd, int chip) · line 106

Quoted 10 lines
board/davinci/dm355evm/dm355evm.c +4 -2
+		__set_bit(14, (void *)&wbase);
+		__set_bit(14, (void *)&rbase);
 	} else {
-		__clear_bit(14, &wbase);
-		__clear_bit(14, &rbase);
+		__clear_bit(14, (void *)&wbase);
+		__clear_bit(14, (void *)&rbase);
 	}
 	this->IO_ADDR_W = (void *)wbase;
 	this->IO_ADDR_R = (void *)rbase;

It looks like __clear_bit is #defined to generic_clear_bit which has this declaration. generic_clear_bit(int nr, volatile unsigned long addr) So maybe changing u32 to volatile unsigned long will work?

Also it looks like dm365evm has the same logic for chip select. At the least, it should also be fixed. Since they look like copies, it would be better if there was a common function.

Tom