scsi: don't set tagging state from scsi_adjust_queue_depth

[mirror_ubuntu-zesty-kernel.git] / drivers / scsi / aic7xxx / aic79xx_osm.c

diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index 9fd6b5618b255137a332cec825cf2038f3a7cd49..80cb4fd7caaa2b3df1974b7260f710ba50eb3613 100644 (file)
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -1469,11 +1469,8 @@ ahd_platform_set_tags(struct ahd_softc *ahd, struct scsi_device *sdev,
 
        switch ((dev->flags & (AHD_DEV_Q_BASIC|AHD_DEV_Q_TAGGED))) {
        case AHD_DEV_Q_BASIC:
-               scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TASK,
-                               dev->openings + dev->active);
-               break;
        case AHD_DEV_Q_TAGGED:
-               scsi_adjust_queue_depth(sdev, MSG_ORDERED_TASK,
+               scsi_adjust_queue_depth(sdev,
                                dev->openings + dev->active);
                break;
        default:
@@ -1483,7 +1480,7 @@ ahd_platform_set_tags(struct ahd_softc *ahd, struct scsi_device *sdev,
                 * serially on the controller/device.  This should
                 * remove some latency.
                 */
-               scsi_adjust_queue_depth(sdev, 0, 1);
+               scsi_adjust_queue_depth(sdev, 1);
                break;
        }
 }