[PATCH 5/8] mtd: rename mtd_read_oob
Sascha Hauer
s.hauer at pengutronix.de
Mon Jul 22 06:04:07 EDT 2013
There is the same function name in the Kernel but with different
semantics. Rename to avoid naming conflicts when we update the
mtd support from the kernel.
Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
drivers/mtd/mtdoob.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mtd/mtdoob.c b/drivers/mtd/mtdoob.c
index 903138c..6023302 100644
--- a/drivers/mtd/mtdoob.c
+++ b/drivers/mtd/mtdoob.c
@@ -37,7 +37,7 @@ static struct mtd_info *to_mtd(struct cdev *cdev)
return mtdoob->mtd;
}
-static ssize_t mtd_read_oob(struct cdev *cdev, void *buf, size_t count,
+static ssize_t mtd_op_read_oob(struct cdev *cdev, void *buf, size_t count,
loff_t _offset, ulong flags)
{
struct mtd_info *mtd = to_mtd(cdev);
@@ -64,7 +64,7 @@ static ssize_t mtd_read_oob(struct cdev *cdev, void *buf, size_t count,
}
static struct file_operations mtd_ops_oob = {
- .read = mtd_read_oob,
+ .read = mtd_op_read_oob,
.ioctl = mtd_ioctl,
.lseek = dev_lseek_default,
};
--
1.8.3.2
More information about the barebox
mailing list