ARM: OMAP: Fix warning in plat-omap/mmu.c

Fix warning

arch/arm/plat-omap/mmu.c:1277: warning: initialization from
incompatible pointer type
arch/arm/plat-omap/mmu.c:1278: warning: initialization from
incompatible pointer type

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

diff --git a/arch/arm/plat-omap/dsp/dsp_mem.c b/arch/arm/plat-omap/dsp/dsp_mem.c
index f75ab7d4c2884e9d99067525115922ff50734f96..ca87a3abb6648117935a3a3d15397c218f596042 100644 (file)
--- a/arch/arm/plat-omap/dsp/dsp_mem.c
+++ b/arch/arm/plat-omap/dsp/dsp_mem.c
@@ -335,13 +335,18 @@ void mbox_fbctl_upd(void) { }
 static ssize_t dsp_mem_read(struct file *file, char __user *buf, size_t count,
                            loff_t *ppos)
 {
-       return __omap_mmu_mem_read(&dsp_mmu, (char __user *)buf, *ppos, count);
+       struct bin_attribute attr;
+
+       return __omap_mmu_mem_read(&dsp_mmu, &attr,
+                                  (char __user *)buf, *ppos, count);
 }
 
 static ssize_t dsp_mem_write(struct file *file, const char __user *buf,
                             size_t count, loff_t *ppos)
 {
-       return __omap_mmu_mem_write(&dsp_mmu,
+       struct bin_attribute attr;
+
+       return __omap_mmu_mem_write(&dsp_mmu, &attr,
                                    (char __user *)buf, *ppos, count);
 }
 

diff --git a/arch/arm/plat-omap/mmu.c b/arch/arm/plat-omap/mmu.c
index 5da83fc231fd2eae2156b9bf07b689d5ea4b5fab..359c2cfebed51283c70c7e8101db79aa946d05c8 100644 (file)
--- a/arch/arm/plat-omap/mmu.c
+++ b/arch/arm/plat-omap/mmu.c
@@ -1178,8 +1178,9 @@ static ssize_t exmem_read(struct omap_mmu *mmu, char *buf, size_t count,
        return count;
 }
 
-static ssize_t omap_mmu_mem_read(struct kobject *kobj, char *buf,
-                                loff_t offset, size_t count)
+static ssize_t omap_mmu_mem_read(struct kobject *kobj,
+                                struct bin_attribute * attr,
+                                char *buf, loff_t offset, size_t count)
 {
        struct device *dev = to_dev(kobj);
        struct omap_mmu *mmu = dev_get_drvdata(dev);
@@ -1245,8 +1246,9 @@ static ssize_t exmem_write(struct omap_mmu *mmu, char *buf, size_t count,
        return count;
 }
 
-static ssize_t omap_mmu_mem_write(struct kobject *kobj, char *buf,
-                                 loff_t offset, size_t count)
+static ssize_t omap_mmu_mem_write(struct kobject *kobj,
+                                 struct bin_attribute * attr,
+                                 char *buf, loff_t offset, size_t count)
 {
        struct device *dev = to_dev(kobj);
        struct omap_mmu *mmu = dev_get_drvdata(dev);
@@ -1279,17 +1281,19 @@ static struct bin_attribute dev_attr_mem = {
 };
 
 /* To be obsolete for backward compatibility */
-ssize_t __omap_mmu_mem_read(struct omap_mmu *mmu, char *buf,
-                           loff_t offset, size_t count)
+ssize_t __omap_mmu_mem_read(struct omap_mmu *mmu,
+                           struct bin_attribute * attr,
+                           char *buf, loff_t offset, size_t count)
 {
-       return omap_mmu_mem_read(&mmu->dev.kobj, buf, offset, count);
+       return omap_mmu_mem_read(&mmu->dev.kobj, attr, buf, offset, count);
 }
 EXPORT_SYMBOL_GPL(__omap_mmu_mem_read);
 
-ssize_t __omap_mmu_mem_write(struct omap_mmu *mmu, char *buf,
-                            loff_t offset, size_t count)
+ssize_t __omap_mmu_mem_write(struct omap_mmu *mmu,
+                            struct bin_attribute * attr,
+                            char *buf, loff_t offset, size_t count)
 {
-       return omap_mmu_mem_write(&mmu->dev.kobj, buf, offset, count);
+       return omap_mmu_mem_write(&mmu->dev.kobj, attr, buf, offset, count);
 }
 EXPORT_SYMBOL_GPL(__omap_mmu_mem_write);
 

diff --git a/include/asm-arm/arch-omap/mmu.h b/include/asm-arm/arch-omap/mmu.h
index 7d1e4504b3315695727d7b05c4e1a468912a60e3..eec5696c8ef2b6c5ea490e1ec7087f9695eb7388 100644 (file)
--- a/include/asm-arm/arch-omap/mmu.h
+++ b/include/asm-arm/arch-omap/mmu.h
@@ -190,7 +190,7 @@ void exmap_clear_mem_page(struct omap_mmu *mmu, unsigned long dspadr);
 int exmap_valid(struct omap_mmu *mmu, void *vadr, size_t len);
 
 /* To be obsolete for backward compatibility */
-ssize_t __omap_mmu_mem_read(struct omap_mmu *mmu, char *buf, loff_t offset, size_t count);
-ssize_t __omap_mmu_mem_write(struct omap_mmu *mmu, char *buf, loff_t offset, size_t count);
+ssize_t __omap_mmu_mem_read(struct omap_mmu *mmu, struct bin_attribute *, char *buf, loff_t offset, size_t count);
+ssize_t __omap_mmu_mem_write(struct omap_mmu *mmu, struct bin_attribute *, char *buf, loff_t offset, size_t count);
 
 #endif /* __ARCH_OMAP_MMU_H */