ARM: OMAP: Fix warning in plat-omap/mmu.c
Subsystems (2)
PATCH 1/1 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 <[email protected]>
arch/arm/plat-omap/dsp/dsp_mem.c +7 -2
@@ -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); }
arch/arm/plat-omap/mmu.c +14 -10
@@ -1178,8 +1178,9 @@ static ssize_t exmem_read(struct omap_mmreturn 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_mreturn 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);
include/asm-arm/arch-omap/mmu.h +2 -2
@@ -190,7 +190,7 @@ void exmap_clear_mem_page(struct omap_mmint 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 */
Quoted 6 lines · Dirk Behme
Fix warning
arch/arm/plat-omap/mmu.c:1277: warning: initialization from incompatible pointer typearch/arm/plat-omap/mmu.c:1278: warning: initialization from incompatible pointer type
Pushing today.
Tony