git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
omap: fix a load of "warning: symbol 'xxx' was not declared. Should it be static?"
[pandora-kernel.git]
/
drivers
/
mmc
/
host
/
omap.c
diff --git
a/drivers/mmc/host/omap.c
b/drivers/mmc/host/omap.c
index
dbc26eb
..
1b9fc3c
100644
(file)
--- a/
drivers/mmc/host/omap.c
+++ b/
drivers/mmc/host/omap.c
@@
-29,14
+29,13
@@
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/io.h>
#include <asm/irq.h>
-#include <asm/mach-types.h>
-#include <
asm/ar
ch/board.h>
-#include <
asm/ar
ch/mmc.h>
-#include <
asm/ar
ch/gpio.h>
-#include <
asm/ar
ch/dma.h>
-#include <
asm/ar
ch/mux.h>
-#include <
asm/ar
ch/fpga.h>
+#include <
ma
ch/board.h>
+#include <
ma
ch/mmc.h>
+#include <
ma
ch/gpio.h>
+#include <
ma
ch/dma.h>
+#include <
ma
ch/mux.h>
+#include <
ma
ch/fpga.h>
#define OMAP_MMC_REG_CMD 0x00
#define OMAP_MMC_REG_ARGL 0x04
#define OMAP_MMC_REG_CMD 0x00
#define OMAP_MMC_REG_ARGL 0x04
@@
-173,7
+172,7
@@
struct mmc_omap_host {
struct omap_mmc_platform_data *pdata;
};
struct omap_mmc_platform_data *pdata;
};
-void mmc_omap_fclk_offdelay(struct mmc_omap_slot *slot)
+
static
void mmc_omap_fclk_offdelay(struct mmc_omap_slot *slot)
{
unsigned long tick_ns;
{
unsigned long tick_ns;
@@
-183,7
+182,7
@@
void mmc_omap_fclk_offdelay(struct mmc_omap_slot *slot)
}
}
}
}
-void mmc_omap_fclk_enable(struct mmc_omap_host *host, unsigned int enable)
+
static
void mmc_omap_fclk_enable(struct mmc_omap_host *host, unsigned int enable)
{
unsigned long flags;
{
unsigned long flags;
@@
-1456,7
+1455,9
@@
static int __init mmc_omap_probe(struct platform_device *pdev)
host->irq = irq;
host->phys_base = host->mem_res->start;
host->irq = irq;
host->phys_base = host->mem_res->start;
- host->virt_base = (void __iomem *) IO_ADDRESS(host->phys_base);
+ host->virt_base = ioremap(res->start, res->end - res->start + 1);
+ if (!host->virt_base)
+ goto err_ioremap;
if (cpu_is_omap24xx()) {
host->iclk = clk_get(&pdev->dev, "mmc_ick");
if (cpu_is_omap24xx()) {
host->iclk = clk_get(&pdev->dev, "mmc_ick");
@@
-1511,6
+1512,8
@@
err_free_iclk:
clk_put(host->iclk);
}
err_free_mmc_host:
clk_put(host->iclk);
}
err_free_mmc_host:
+ iounmap(host->virt_base);
+err_ioremap:
kfree(host);
err_free_mem_region:
release_mem_region(res->start, res->end - res->start + 1);
kfree(host);
err_free_mem_region:
release_mem_region(res->start, res->end - res->start + 1);
@@
-1537,6
+1540,7
@@
static int mmc_omap_remove(struct platform_device *pdev)
if (host->fclk && !IS_ERR(host->fclk))
clk_put(host->fclk);
if (host->fclk && !IS_ERR(host->fclk))
clk_put(host->fclk);
+ iounmap(host->virt_base);
release_mem_region(pdev->resource[0].start,
pdev->resource[0].end - pdev->resource[0].start + 1);
release_mem_region(pdev->resource[0].start,
pdev->resource[0].end - pdev->resource[0].start + 1);