From: Dirk Behme <dirk.behme@googlemail.com>
To: linux-omap-open-source@linux.omap.com
Subject: [PATCH] ARM: OMAP: Fix warning in plat-omap/mmu.c
Date: Sun, 12 Aug 2007 09:13:44 +0200 [thread overview]
Message-ID: <46BEB328.105@googlemail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 235 bytes --]
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>
[-- Attachment #2: 01_plat_omap_mmu_warning_patch.txt --]
[-- Type: text/plain, Size: 3678 bytes --]
Index: linux-osk/arch/arm/plat-omap/dsp/dsp_mem.c
===================================================================
--- linux-osk.orig/arch/arm/plat-omap/dsp/dsp_mem.c
+++ linux-osk/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);
}
Index: linux-osk/arch/arm/plat-omap/mmu.c
===================================================================
--- linux-osk.orig/arch/arm/plat-omap/mmu.c
+++ linux-osk/arch/arm/plat-omap/mmu.c
@@ -1178,8 +1178,9 @@ static ssize_t exmem_read(struct omap_mm
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_m
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);
Index: linux-osk/include/asm-arm/arch-omap/mmu.h
===================================================================
--- linux-osk.orig/include/asm-arm/arch-omap/mmu.h
+++ linux-osk/include/asm-arm/arch-omap/mmu.h
@@ -190,7 +190,7 @@ void exmap_clear_mem_page(struct omap_mm
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 */
[-- Attachment #3: Type: text/plain, Size: 0 bytes --]
next reply other threads:[~2007-08-12 7:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-12 7:13 Dirk Behme [this message]
2007-08-13 8:56 ` [PATCH] ARM: OMAP: Fix warning in plat-omap/mmu.c Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=46BEB328.105@googlemail.com \
--to=dirk.behme@googlemail.com \
--cc=linux-omap-open-source@linux.omap.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.