Merge tag 'trace-seq-buf-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...

[cascardo/linux.git] / drivers / scsi / stex.c

diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c
index 1aa4bef..98a62bc 100644 (file)
--- a/drivers/scsi/stex.c
+++ b/drivers/scsi/stex.c
@@ -543,34 +543,16 @@ stex_ss_send_cmd(struct st_hba *hba, struct req_msg *req, u16 tag)
        readl(hba->mmio_base + YH2I_REQ); /* flush */
 }
 
-static int
-stex_slave_alloc(struct scsi_device *sdev)
-{
-       /* Cheat: usually extracted from Inquiry data */
-       sdev->tagged_supported = 1;
-
-       scsi_activate_tcq(sdev, sdev->host->can_queue);
-
-       return 0;
-}
-
 static int
 stex_slave_config(struct scsi_device *sdev)
 {
        sdev->use_10_for_rw = 1;
        sdev->use_10_for_ms = 1;
        blk_queue_rq_timeout(sdev->request_queue, 60 * HZ);
-       sdev->tagged_supported = 1;
 
        return 0;
 }
 
-static void
-stex_slave_destroy(struct scsi_device *sdev)
-{
-       scsi_deactivate_tcq(sdev, 1);
-}
-
 static int
 stex_queuecommand_lck(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))
 {
@@ -1162,9 +1144,7 @@ static int stex_abort(struct scsi_cmnd *cmd)
        int result = SUCCESS;
        unsigned long flags;
 
-       printk(KERN_INFO DRV_NAME
-               "(%s): aborting command\n", pci_name(hba->pdev));
-       scsi_print_command(cmd);
+       scmd_printk(KERN_INFO, cmd, "aborting command\n");
 
        base = hba->mmio_base;
        spin_lock_irqsave(host->host_lock, flags);
@@ -1352,9 +1332,8 @@ static int stex_reset(struct scsi_cmnd *cmd)
 
        hba = (struct st_hba *) &cmd->device->host->hostdata[0];
 
-       printk(KERN_INFO DRV_NAME
-               "(%s): resetting host\n", pci_name(hba->pdev));
-       scsi_print_command(cmd);
+       shost_printk(KERN_INFO, cmd->device->host,
+                    "resetting host\n");
 
        return stex_do_reset(hba) ? FAILED : SUCCESS;
 }
@@ -1391,12 +1370,11 @@ static struct scsi_host_template driver_template = {
        .proc_name                      = DRV_NAME,
        .bios_param                     = stex_biosparam,
        .queuecommand                   = stex_queuecommand,
-       .slave_alloc                    = stex_slave_alloc,
        .slave_configure                = stex_slave_config,
-       .slave_destroy                  = stex_slave_destroy,
        .eh_abort_handler               = stex_abort,
        .eh_host_reset_handler          = stex_reset,
        .this_id                        = -1,
+       .use_blk_tags                   = 1,
 };
 
 static struct pci_device_id stex_pci_tbl[] = {