st: call scsi_set_medium_removal directly

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>

diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 7d2e036c75c17581101e2254740a5d814a6b0a2c..e46e02b24ba47d8953df47e96f2639ffe8fc6d4c 100644 (file)
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -861,17 +861,16 @@ static int set_mode_densblk(struct scsi_tape * STp, struct st_modedef * STm)
 /* Lock or unlock the drive door. Don't use when st_request allocated. */
 static int do_door_lock(struct scsi_tape * STp, int do_lock)
 {
-       int retval, cmd;
+       int retval;
 
-       cmd = do_lock ? SCSI_IOCTL_DOORLOCK : SCSI_IOCTL_DOORUNLOCK;
        DEBC_printk(STp, "%socking drive door.\n", do_lock ? "L" : "Unl");
-       retval = scsi_ioctl(STp->device, cmd, NULL);
-       if (!retval) {
+
+       retval = scsi_set_medium_removal(STp->device,
+                       do_lock ? SCSI_REMOVAL_PREVENT : SCSI_REMOVAL_ALLOW);
+       if (!retval)
                STp->door_locked = do_lock ? ST_LOCKED_EXPLICIT : ST_UNLOCKED;
-       }
-       else {
+       else
                STp->door_locked = ST_LOCK_FAILS;
-       }
        return retval;
 }