Remove warnings:

arch/arm/plat-omap/dsp/dsp_core.c:760: warning: initialization from
incompatible pointer type
arch/arm/plat-omap/dsp/dsp_mem.c:1579: warning: initialization from
incompatible pointer type

Signed-off-by: Dirk Behme <dirk.behme_at_de.bosch.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/plat-omap/dsp/dsp_core.c b/arch/arm/plat-omap/dsp/dsp_core.c
index c0a06492f40a09b3aaa0cf743bc43c6614189f70..b0f62b84ad7ff686d2004cc165cf1fb4e94ab888 100644 (file)
--- a/arch/arm/plat-omap/dsp/dsp_core.c
+++ b/arch/arm/plat-omap/dsp/dsp_core.c
@@ -696,7 +696,7 @@ static int dsp_drv_remove(struct device *dev)
 }
 
 #ifdef CONFIG_PM
-static int dsp_drv_suspend(struct device *dev, u32 state, u32 level)
+static int dsp_drv_suspend(struct device *dev, pm_message_t state, u32 level)
 {
        switch(level) {
        case SUSPEND_NOTIFY:

diff --git a/arch/arm/plat-omap/dsp/dsp_mem.c b/arch/arm/plat-omap/dsp/dsp_mem.c
index afae8ac6072454717154ac5a6f1022e22eab9450..7ad0c05491ff1026c9d04f6c8ad903955ee69a7c 100644 (file)
--- a/arch/arm/plat-omap/dsp/dsp_mem.c
+++ b/arch/arm/plat-omap/dsp/dsp_mem.c
@@ -1565,7 +1565,8 @@ static ssize_t exmap_show(struct device *dev, struct device_attribute *attr,
 
 static struct device_attribute dev_attr_exmap = __ATTR_RO(exmap);
 
-static ssize_t kmem_pool_show(struct device *dev, char *buf)
+static ssize_t kmem_pool_show(struct device *dev,
+                             struct device_attribute *attr, char *buf)
 {
        int count_1M, count_64K, total;