1 files changed, 5 insertions, 9 deletions

diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index fc393bd95f4a..4eb7bba24a68 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -1336,14 +1336,12 @@ ahd_platform_set_tags(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,
 
         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);
+                scsi_set_tag_type(sdev, MSG_SIMPLE_TASK);
+                scsi_activate_tcq(sdev, dev->openings + dev->active);
                 break;
         case AHD_DEV_Q_TAGGED:
-                scsi_adjust_queue_depth(sdev,
-                                        MSG_ORDERED_TASK,
-                                        dev->openings + dev->active);
+                scsi_set_tag_type(sdev, MSG_ORDERED_TASK);
+                scsi_activate_tcq(sdev, dev->openings + dev->active);
                 break;
         default:
                 /*
@@ -1352,9 +1350,7 @@ ahd_platform_set_tags(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,
                  * serially on the controller/device.  This should
                  * remove some latency.
                  */
-                scsi_adjust_queue_depth(sdev,
-                                        /*NON-TAGGED*/0,
-                                        /*queue depth*/2);
+                scsi_deactivate_tcq(sdev, 1);
                 break;
         }
 }