ide: add ide_do_start_stop() helper

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

* Remove no longer used idefloppy_create_start_stop_cmd()
  and idetape_create_load_unload_cmd().

There should be no functional changes caused by this patch.

Acked-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

4 files changed, 24 insertions, 35 deletions

diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index c647a40c0d33..58411591edf3 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -162,6 +162,21 @@ int ide_queue_pc_tail(ide_drive_t *drive, struct gendisk *disk,
 }
 EXPORT_SYMBOL_GPL(ide_queue_pc_tail);
 
+int ide_do_start_stop(ide_drive_t *drive, struct gendisk *disk, int start)
+{
+        struct ide_atapi_pc pc;
+
+        ide_init_pc(&pc);
+        pc.c[0] = START_STOP;
+        pc.c[4] = start;
+
+        if (drive->media == ide_tape)
+                pc.flags |= PC_FLAG_WAIT_FOR_DSC;
+
+        return ide_queue_pc_tail(drive, disk, &pc);
+}
+EXPORT_SYMBOL_GPL(ide_do_start_stop);
+
 int ide_set_media_lock(ide_drive_t *drive, struct gendisk *disk, int on)
 {
         struct ide_atapi_pc pc;
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index f39cf404b030..b221a456e535 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -359,13 +359,6 @@ void ide_floppy_create_mode_sense_cmd(struct ide_atapi_pc *pc, u8 page_code)
         pc->req_xfer = length;
 }
 
-static void idefloppy_create_start_stop_cmd(struct ide_atapi_pc *pc, int start)
-{
-        ide_init_pc(pc);
-        pc->c[0] = GPCMD_START_STOP_UNIT;
-        pc->c[4] = start;
-}
-
 static void idefloppy_create_rw_cmd(idefloppy_floppy_t *floppy,
                                     struct ide_atapi_pc *pc, struct request *rq,
                                     unsigned long sector)
@@ -800,10 +793,8 @@ static int idefloppy_open(struct inode *inode, struct file *filp)
                 ide_init_pc(&pc);
                 pc.c[0] = GPCMD_TEST_UNIT_READY;
 
-                if (ide_queue_pc_tail(drive, disk, &pc)) {
-                        idefloppy_create_start_stop_cmd(&pc, 1);
-                        (void)ide_queue_pc_tail(drive, disk, &pc);
-                }
+                if (ide_queue_pc_tail(drive, disk, &pc))
+                        ide_do_start_stop(drive, disk, 1);
 
                 if (ide_floppy_get_capacity(drive)
                    && (filp->f_flags & O_NDELAY) == 0
@@ -880,10 +871,8 @@ static int ide_floppy_lockdoor(ide_drive_t *drive, struct ide_atapi_pc *pc,
 
         ide_set_media_lock(drive, disk, prevent);
 
-        if (cmd == CDROMEJECT) {
-                idefloppy_create_start_stop_cmd(pc, 2);
-                (void)ide_queue_pc_tail(drive, disk, pc);
-        }
+        if (cmd == CDROMEJECT)
+                ide_do_start_stop(drive, disk, 2);
 
         return 0;
 }
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index b7f3eebc0d15..5204bef4a21c 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -1125,15 +1125,6 @@ static void idetape_create_test_unit_ready_cmd(struct ide_atapi_pc *pc)
         pc->c[0] = TEST_UNIT_READY;
 }
 
-static void idetape_create_load_unload_cmd(ide_drive_t *drive,
-                struct ide_atapi_pc *pc, int cmd)
-{
-        ide_init_pc(pc);
-        pc->c[0] = START_STOP;
-        pc->c[4] = cmd;
-        pc->flags |= PC_FLAG_WAIT_FOR_DSC;
-}
-
 static int idetape_wait_ready(ide_drive_t *drive, unsigned long timeout)
 {
         idetape_tape_t *tape = drive->driver_data;
@@ -1153,9 +1144,7 @@ static int idetape_wait_ready(ide_drive_t *drive, unsigned long timeout)
                         /* no media */
                         if (load_attempted)
                                 return -ENOMEDIUM;
-                        idetape_create_load_unload_cmd(drive, &pc,
-                                                        IDETAPE_LU_LOAD_MASK);
-                        ide_queue_pc_tail(drive, disk, &pc);
+                        ide_do_start_stop(drive, disk, IDETAPE_LU_LOAD_MASK);
                         load_attempted = 1;
                 /* not about to be ready */
                 } else if (!(tape->sense_key == 2 && tape->asc == 4 &&
@@ -1836,9 +1825,7 @@ static int idetape_mtioctop(ide_drive_t *drive, short mt_op, int mt_count)
                 return 0;
         case MTLOAD:
                 ide_tape_discard_merge_buffer(drive, 0);
-                idetape_create_load_unload_cmd(drive, &pc,
-                                               IDETAPE_LU_LOAD_MASK);
-                return ide_queue_pc_tail(drive, disk, &pc);
+                return ide_do_start_stop(drive, disk, IDETAPE_LU_LOAD_MASK);
         case MTUNLOAD:
         case MTOFFL:
                 /*
@@ -1850,9 +1837,7 @@ static int idetape_mtioctop(ide_drive_t *drive, short mt_op, int mt_count)
                                 tape->door_locked = DOOR_UNLOCKED;
                 }
                 ide_tape_discard_merge_buffer(drive, 0);
-                idetape_create_load_unload_cmd(drive, &pc,
-                                              !IDETAPE_LU_LOAD_MASK);
-                retval = ide_queue_pc_tail(drive, disk, &pc);
+                retval = ide_do_start_stop(drive, disk, !IDETAPE_LU_LOAD_MASK);
                 if (!retval)
                         clear_bit(IDE_AFLAG_MEDIUM_PRESENT, &drive->atapi_flags);
                 return retval;
@@ -1861,9 +1846,8 @@ static int idetape_mtioctop(ide_drive_t *drive, short mt_op, int mt_count)
                 return idetape_flush_tape_buffers(drive);
         case MTRETEN:
                 ide_tape_discard_merge_buffer(drive, 0);
-                idetape_create_load_unload_cmd(drive, &pc,
+                return ide_do_start_stop(drive, disk,
                         IDETAPE_LU_RETENSION_MASK | IDETAPE_LU_LOAD_MASK);
-                return ide_queue_pc_tail(drive, disk, &pc);
         case MTEOM:
                 idetape_create_space_cmd(&pc, 0, IDETAPE_SPACE_TO_EOD);
                 return ide_queue_pc_tail(drive, disk, &pc);
diff --git a/include/linux/ide.h b/include/linux/ide.h
index ac067a3c1be3..be79122b9431 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1142,6 +1142,7 @@ void ide_queue_pc_head(ide_drive_t *, struct gendisk *, struct ide_atapi_pc *,
                        struct request *);
 int ide_queue_pc_tail(ide_drive_t *, struct gendisk *, struct ide_atapi_pc *);
 
+int ide_do_start_stop(ide_drive_t *, struct gendisk *, int);
 int ide_set_media_lock(ide_drive_t *, struct gendisk *, int);
 
 ide_startstop_t ide_pc_intr(ide_drive_t *drive, struct ide_atapi_pc *pc,