Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 1 insertions, 18 deletions

diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c
index e0c0ee5bc966..dfa8806b1e13 100644
--- a/drivers/message/fusion/mptspi.c
+++ b/drivers/message/fusion/mptspi.c
@@ -102,19 +102,6 @@ static int	mptspiDoneCtx = -1;
 static int      mptspiTaskCtx = -1;
 static int      mptspiInternalCtx = -1; /* Used only for internal commands */
 
-static struct device_attribute mptspi_queue_depth_attr = {
-        .attr = {
-                .name =         "queue_depth",
-                .mode =         S_IWUSR,
-        },
-        .store = mptscsih_store_queue_depth,
-};
-
-static struct device_attribute *mptspi_dev_attrs[] = {
-        &mptspi_queue_depth_attr,
-        NULL,
-};
-
 static struct scsi_host_template mptspi_driver_template = {
         .proc_name                      = "mptspi",
         .proc_info                      = mptscsih_proc_info,
@@ -124,6 +111,7 @@ static struct scsi_host_template mptspi_driver_template = {
         .slave_alloc                    = mptscsih_slave_alloc,
         .slave_configure                = mptscsih_slave_configure,
         .slave_destroy                  = mptscsih_slave_destroy,
+        .change_queue_depth             = mptscsih_change_queue_depth,
         .eh_abort_handler               = mptscsih_abort,
         .eh_device_reset_handler        = mptscsih_dev_reset,
         .eh_bus_reset_handler           = mptscsih_bus_reset,
@@ -135,7 +123,6 @@ static struct scsi_host_template mptspi_driver_template = {
         .max_sectors                    = 8192,
         .cmd_per_lun                    = 7,
         .use_clustering                 = ENABLE_CLUSTERING,
-        .sdev_attrs                     = mptspi_dev_attrs,
 };
 
 
@@ -287,10 +274,6 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                 sh->sg_tablesize = numSGE;
         }
 
-        /* Set the pci device pointer in Scsi_Host structure.
-         */
-        scsi_set_device(sh, &ioc->pcidev->dev);
-
         spin_unlock_irqrestore(&ioc->FreeQlock, flags);
 
         hd = (MPT_SCSI_HOST *) sh->hostdata;