From 9102efae6ab7d8ee2607b842f2cdf6cbffaadb86 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Fri, 11 Jan 2019 21:58:14 -0800 Subject: block: Alias block_op_close() to block_op_flush() The two functions are identical, so there's no need to keep two copies of the same code around. Alias block_op_close() to block_op_flush() and drop standalone definition for the former. Signed-off-by: Andrey Smirnov Signed-off-by: Sascha Hauer --- common/block.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'common/block.c') diff --git a/common/block.c b/common/block.c index 8d0de42d90..549df71a9d 100644 --- a/common/block.c +++ b/common/block.c @@ -329,13 +329,6 @@ static ssize_t block_op_write(struct cdev *cdev, const void *buf, size_t count, } #endif -static int block_op_close(struct cdev *cdev) -{ - struct block_device *blk = cdev->priv; - - return writebuffer_flush(blk); -} - static int block_op_flush(struct cdev *cdev) { struct block_device *blk = cdev->priv; @@ -343,6 +336,8 @@ static int block_op_flush(struct cdev *cdev) return writebuffer_flush(blk); } +static int block_op_close(struct cdev *cdev) __alias(block_op_flush); + static struct cdev_operations block_ops = { .read = block_op_read, #ifdef CONFIG_BLOCK_WRITE -- cgit v1.2.3