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:
parent
f79343dec4
commit
b5c4e238d3
|
@ -176,7 +176,7 @@ static void *block_get(struct block_device *blk, int block)
|
||||||
return outdata;
|
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)
|
loff_t offset, unsigned long flags)
|
||||||
{
|
{
|
||||||
struct block_device *blk = cdev->priv;
|
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;
|
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)
|
loff_t offset, ulong flags)
|
||||||
{
|
{
|
||||||
struct block_device *blk = cdev->priv;
|
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
|
#endif
|
||||||
|
|
||||||
static int block_close(struct cdev *cdev)
|
static int block_op_close(struct cdev *cdev)
|
||||||
{
|
{
|
||||||
struct block_device *blk = cdev->priv;
|
struct block_device *blk = cdev->priv;
|
||||||
|
|
||||||
return writebuffer_flush(blk);
|
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;
|
struct block_device *blk = cdev->priv;
|
||||||
|
|
||||||
|
@ -325,12 +325,12 @@ static int block_flush(struct cdev *cdev)
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct file_operations block_ops = {
|
static struct file_operations block_ops = {
|
||||||
.read = block_read,
|
.read = block_op_read,
|
||||||
#ifdef CONFIG_BLOCK_WRITE
|
#ifdef CONFIG_BLOCK_WRITE
|
||||||
.write = block_write,
|
.write = block_op_write,
|
||||||
#endif
|
#endif
|
||||||
.close = block_close,
|
.close = block_op_close,
|
||||||
.flush = block_flush,
|
.flush = block_op_flush,
|
||||||
.lseek = dev_lseek_default,
|
.lseek = dev_lseek_default,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue