ide: add ide_do_test_unit_ready() helper

* Add ide_do_test_unit_ready() helper and convert ide-{floppy,tape}.c
  to use it.

* Remove no longer used idetape_create_test_unit_ready_cmd().

There should be no functional changes caused by this patch.

Acked-by: Borislav Petkov <petkovbb@gmail.com>
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

3 files changed, 13 insertions, 14 deletions

diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index 58411591edf3..608c5bade929 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -162,6 +162,17 @@ int ide_queue_pc_tail(ide_drive_t *drive, struct gendisk *disk,
 }
 EXPORT_SYMBOL_GPL(ide_queue_pc_tail);
 
+int ide_do_test_unit_ready(ide_drive_t *drive, struct gendisk *disk)
+{
+        struct ide_atapi_pc pc;
+
+        ide_init_pc(&pc);
+        pc.c[0] = TEST_UNIT_READY;
+
+        return ide_queue_pc_tail(drive, disk, &pc);
+}
+EXPORT_SYMBOL_GPL(ide_do_test_unit_ready);
+
 int ide_do_start_stop(ide_drive_t *drive, struct gendisk *disk, int start)
 {
         struct ide_atapi_pc pc;
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index b221a456e535..4d7e9ef82425 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -773,7 +773,6 @@ static int idefloppy_open(struct inode *inode, struct file *filp)
         struct gendisk *disk = inode->i_bdev->bd_disk;
         struct ide_floppy_obj *floppy;
         ide_drive_t *drive;
-        struct ide_atapi_pc pc;
         int ret = 0;
 
         debug_log("Reached %s\n", __func__);
@@ -790,10 +789,7 @@ static int idefloppy_open(struct inode *inode, struct file *filp)
                 drive->atapi_flags &= ~IDE_AFLAG_FORMAT_IN_PROGRESS;
                 /* Just in case */
 
-                ide_init_pc(&pc);
-                pc.c[0] = GPCMD_TEST_UNIT_READY;
-
-                if (ide_queue_pc_tail(drive, disk, &pc))
+                if (ide_do_test_unit_ready(drive, disk))
                         ide_do_start_stop(drive, disk, 1);
 
                 if (ide_floppy_get_capacity(drive)
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 5204bef4a21c..737dd7db6bb7 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -1119,25 +1119,17 @@ static void idetape_create_write_filemark_cmd(ide_drive_t *drive,
         pc->flags |= PC_FLAG_WAIT_FOR_DSC;
 }
 
-static void idetape_create_test_unit_ready_cmd(struct ide_atapi_pc *pc)
-{
-        ide_init_pc(pc);
-        pc->c[0] = TEST_UNIT_READY;
-}
-
 static int idetape_wait_ready(ide_drive_t *drive, unsigned long timeout)
 {
         idetape_tape_t *tape = drive->driver_data;
         struct gendisk *disk = tape->disk;
-        struct ide_atapi_pc pc;
         int load_attempted = 0;
 
         /* Wait for the tape to become ready */
         set_bit(IDE_AFLAG_MEDIUM_PRESENT, &drive->atapi_flags);
         timeout += jiffies;
         while (time_before(jiffies, timeout)) {
-                idetape_create_test_unit_ready_cmd(&pc);
-                if (!ide_queue_pc_tail(drive, disk, &pc))
+                if (ide_do_test_unit_ready(drive, disk) == 0)
                         return 0;
                 if ((tape->sense_key == 2 && tape->asc == 4 && tape->ascq == 2)
                     || (tape->asc == 0x3A)) {