sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

block: rename file operation functions 

block_read and block_write collide with a to-be-introduced
global function, so rename the file operation functions.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2013-04-04 12:59:49 +02:00
parent f79343dec4
commit b5c4e238d3
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/block.c
View File

@ -176,7 +176,7 @@ static void *block_get(struct block_device *blk, int block)
return outdata;
}
static ssize_t block_read(struct cdev *cdev, void *buf, size_t count,
static ssize_t block_op_read(struct cdev *cdev, void *buf, size_t count,
loff_t offset, unsigned long flags)
{
struct block_device *blk = cdev->priv;
@ -253,7 +253,7 @@ static int block_put(struct block_device *blk, const void *buf, int block)
return 0;
}
static ssize_t block_write(struct cdev *cdev, const void *buf, size_t count,
static ssize_t block_op_write(struct cdev *cdev, const void *buf, size_t count,
loff_t offset, ulong flags)
{
struct block_device *blk = cdev->priv;
@ -310,14 +310,14 @@ static ssize_t block_write(struct cdev *cdev, const void *buf, size_t count,
}
#endif
static int block_close(struct cdev *cdev)
static int block_op_close(struct cdev *cdev)
{
struct block_device *blk = cdev->priv;
return writebuffer_flush(blk);
}
static int block_flush(struct cdev *cdev)
static int block_op_flush(struct cdev *cdev)
{
struct block_device *blk = cdev->priv;
@ -325,12 +325,12 @@ static int block_flush(struct cdev *cdev)
}
static struct file_operations block_ops = {
.read = block_read,
.read = block_op_read,
#ifdef CONFIG_BLOCK_WRITE
.write = block_write,
.write = block_op_write,
#endif
.close = block_close,
.flush = block_flush,
.close = block_op_close,
.flush = block_op_flush,
.lseek = dev_lseek_default,
};