Skip to contentSkip to conversation

ARM: OMAP: Trivial warning fixups.

PATCH In review Paul Mundt 2 participants 2 messages Jan 23, 2006 – Jan 25, 2006

Subsystems (2)
Arm (32-bit) MMC, SD and SDIO
lore
Share & tools
lore

Paul Mundt

author
#0 lore raw

PATCH 1/1 ARM: OMAP: Trivial warning fixups.

Bogus type for vfree() in __ioremap_pfn() (should probably use remove_vm_area() anyways), and some type mismatches in the OMAP MMC driver.

Signed-off-by Paul Mundt <[email protected]>

---

 arch/arm/mm/ioremap.c |    2 +-
 drivers/mmc/omap.c    |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

dfe121170f696b2557e3c43a5aceffa66b739c9c

arch/arm/mm/ioremap.c +1 -1
index de3ce1e..c45bfea 100644
@@ -142,7 +142,7 @@ __ioremap_pfn(unsigned long pfn, unsigne
  		return NULL;
  	addr = (unsigned long)area->addr;
  	if (remap_area_pages(addr, pfn, size, flags)) {
- 		vfree(addr);
+		vfree((void *)addr);
  		return NULL;
  	}
  	return (void __iomem *) (offset + (char *)addr);
drivers/mmc/omap.c +3 -2
index f76efee..1eb3a58 100644
@@ -678,7 +678,7 @@ mmc_omap_prepare_dma(struct mmc_omap_hos
 	int dst_port = 0;
 	int sync_dev = 0;
 
-	data_addr = io_v2p((void __force *) host->base) + OMAP_MMC_REG_DATA;
+	data_addr = (unsigned long)io_v2p((void __force *) host->base) + OMAP_MMC_REG_DATA;
 	frame = 1 << data->blksz_bits;
 	count = (u32)sg_dma_len(sg);
 

@@ -1306,7 +1306,8 @@ static int __init mmc_omap_probe(struct 
 	}
 
 	if (omap_has_menelaus())
-		menelaus_mmc_register(mmc_omap_switch_callback, &host);
+		menelaus_mmc_register(mmc_omap_switch_callback,
+				      (unsigned long)&host);
 
 no_switch:
 	return 0;
#1 lore raw
Quoted 18 lines · Paul Mundt

Bogus type for vfree() in __ioremap_pfn() (should probably use remove_vm_area() anyways), and some type mismatches in the OMAP MMC driver.

Signed-off-by Paul Mundt <[email protected]>

---

 arch/arm/mm/ioremap.c |    2 +-
 drivers/mmc/omap.c    |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

dfe121170f696b2557e3c43a5aceffa66b739c9c

arch/arm/mm/ioremap.c +0 -0
index de3ce1e..c45bfea 100644

arch/arm/mm/ioremap.c __ioremap_pfn(unsigned long pfn, unsigne · line 148

Quoted 8 lines
arch/arm/mm/ioremap.c +1 -1
@@ -142,7 +142,7 @@ __ioremap_pfn(unsigned long pfn, unsigne
  		return NULL;
  	addr = (unsigned long)area->addr;
  	if (remap_area_pages(addr, pfn, size, flags)) {
- 		vfree(addr);
+		vfree((void *)addr);
  		return NULL;
  	}
  	return (void __iomem *) (offset + (char *)addr);

Pushed. Do you want to send the chunk above to RMK?

Tony