Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / drivers / scsi / stex.c

diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c
index b5eae4f6ba46e820f1b5b6359259423872ffeee9..98a62bc15069773ba2de93dd9d4164e8655919f0 100644 (file)
--- a/drivers/scsi/stex.c
+++ b/drivers/scsi/stex.c
@@ -543,24 +543,12 @@ 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_adjust_queue_depth(sdev, 0, 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;
 }
@@ -1382,7 +1370,6 @@ 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,
        .eh_abort_handler               = stex_abort,
        .eh_host_reset_handler          = stex_reset,