From f5020bfedab68aed1b7a67b8151a3baa48b39963 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Tue, 24 Jan 2006 19:57:52 -0800 Subject: [PATCH] [PATCH] 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 Signed-off-by: Tony Lindgren --- arch/arm/mm/ioremap.c | 2 +- drivers/mmc/omap.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c index de3ce1eec2e..c45bfeaf41a 100644 --- a/arch/arm/mm/ioremap.c +++ b/arch/arm/mm/ioremap.c @@ -142,7 +142,7 @@ __ioremap_pfn(unsigned long pfn, unsigned long offset, size_t size, 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); diff --git a/drivers/mmc/omap.c b/drivers/mmc/omap.c index f76efee8284..35708dbf9d8 100644 --- a/drivers/mmc/omap.c +++ b/drivers/mmc/omap.c @@ -678,7 +678,7 @@ mmc_omap_prepare_dma(struct mmc_omap_host *host, struct mmc_data *data) 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 platform_device *pdev) } 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; -- 2.41.1