aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/message/fusion/mptspi.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-26 16:28:47 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-26 16:28:47 -0400
commit2d986010ad13a00b83851238d52601d6092df40e (patch)
tree6a43ffd30290fc051435643d485ad12fb1448ed5 /drivers/message/fusion/mptspi.c
parent6b6a93c6876ea1c530d5d3f68e3678093a27fab0 (diff)
parente10fb91c4dc81a4ae47caf0828df152f600f2546 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'drivers/message/fusion/mptspi.c')
-rw-r--r--drivers/message/fusion/mptspi.c19
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;
102static int mptspiTaskCtx = -1; 102static int mptspiTaskCtx = -1;
103static int mptspiInternalCtx = -1; /* Used only for internal commands */ 103static int mptspiInternalCtx = -1; /* Used only for internal commands */
104 104
105static struct device_attribute mptspi_queue_depth_attr = {
106 .attr = {
107 .name = "queue_depth",
108 .mode = S_IWUSR,
109 },
110 .store = mptscsih_store_queue_depth,
111};
112
113static struct device_attribute *mptspi_dev_attrs[] = {
114 &mptspi_queue_depth_attr,
115 NULL,
116};
117
118static struct scsi_host_template mptspi_driver_template = { 105static struct scsi_host_template mptspi_driver_template = {
119 .proc_name = "mptspi", 106 .proc_name = "mptspi",
120 .proc_info = mptscsih_proc_info, 107 .proc_info = mptscsih_proc_info,
@@ -124,6 +111,7 @@ static struct scsi_host_template mptspi_driver_template = {
124 .slave_alloc = mptscsih_slave_alloc, 111 .slave_alloc = mptscsih_slave_alloc,
125 .slave_configure = mptscsih_slave_configure, 112 .slave_configure = mptscsih_slave_configure,
126 .slave_destroy = mptscsih_slave_destroy, 113 .slave_destroy = mptscsih_slave_destroy,
114 .change_queue_depth = mptscsih_change_queue_depth,
127 .eh_abort_handler = mptscsih_abort, 115 .eh_abort_handler = mptscsih_abort,
128 .eh_device_reset_handler = mptscsih_dev_reset, 116 .eh_device_reset_handler = mptscsih_dev_reset,
129 .eh_bus_reset_handler = mptscsih_bus_reset, 117 .eh_bus_reset_handler = mptscsih_bus_reset,
@@ -135,7 +123,6 @@ static struct scsi_host_template mptspi_driver_template = {
135 .max_sectors = 8192, 123 .max_sectors = 8192,
136 .cmd_per_lun = 7, 124 .cmd_per_lun = 7,
137 .use_clustering = ENABLE_CLUSTERING, 125 .use_clustering = ENABLE_CLUSTERING,
138 .sdev_attrs = mptspi_dev_attrs,
139}; 126};
140 127
141 128
@@ -287,10 +274,6 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
287 sh->sg_tablesize = numSGE; 274 sh->sg_tablesize = numSGE;
288 } 275 }
289 276
290 /* Set the pci device pointer in Scsi_Host structure.
291 */
292 scsi_set_device(sh, &ioc->pcidev->dev);
293
294 spin_unlock_irqrestore(&ioc->FreeQlock, flags); 277 spin_unlock_irqrestore(&ioc->FreeQlock, flags);
295 278
296 hd = (MPT_SCSI_HOST *) sh->hostdata; 279 hd = (MPT_SCSI_HOST *) sh->hostdata;