1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 1358d8351f33..00b7e0cb8b1a 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -1779,7 +1779,7 @@ static int idetape_add_chrdev_write_request(ide_drive_t *drive, int blocks)
                                      blocks, tape->merge_stage->bh);
 }
 
-static void idetape_empty_write_pipeline(ide_drive_t *drive)
+static void ide_tape_flush_merge_buffer(ide_drive_t *drive)
 {
         idetape_tape_t *tape = drive->driver_data;
         int blocks, min;
@@ -1841,7 +1841,7 @@ static int idetape_init_read(ide_drive_t *drive)
         /* Initialize read operation */
         if (tape->chrdev_dir != IDETAPE_DIR_READ) {
                 if (tape->chrdev_dir == IDETAPE_DIR_WRITE) {
-                        idetape_empty_write_pipeline(drive);
+                        ide_tape_flush_merge_buffer(drive);
                         idetape_flush_tape_buffers(drive);
                 }
                 if (tape->merge_stage || tape->merge_stage_size) {
@@ -2357,7 +2357,7 @@ static int idetape_chrdev_ioctl(struct inode *inode, struct file *file,
         debug_log(DBG_CHRDEV, "Enter %s, cmd=%u\n", __func__, cmd);
 
         if (tape->chrdev_dir == IDETAPE_DIR_WRITE) {
-                idetape_empty_write_pipeline(drive);
+                ide_tape_flush_merge_buffer(drive);
                 idetape_flush_tape_buffers(drive);
         }
         if (cmd == MTIOCGET || cmd == MTIOCPOS) {
@@ -2506,7 +2506,7 @@ static void idetape_write_release(ide_drive_t *drive, unsigned int minor)
 {
         idetape_tape_t *tape = drive->driver_data;
 
-        idetape_empty_write_pipeline(drive);
+        ide_tape_flush_merge_buffer(drive);
         tape->merge_stage = ide_tape_kmalloc_buffer(tape, 1, 0);
         if (tape->merge_stage != NULL) {
                 idetape_pad_zeros(drive, tape->blk_size *