diff options
author | Dan Williams <dan.j.williams@intel.com> | 2011-09-20 18:11:03 -0400 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2011-10-02 13:40:43 -0400 |
commit | 11e16364aaac4544dd26ca56d399c954cc95d7a5 (patch) | |
tree | 909ade73511f7ef1f233bfa54684c2512828ae86 /drivers/scsi/pm8001/pm8001_sas.c | |
parent | e211e2c7b6e7f470c818ef67c952954e1b46a46d (diff) |
[SCSI] pm8001: remove pm8001_slave_{alloc|configure}
libsas handles:
1/ limiting ata scanning to lun0
2/ changes to /sys/block/<sdX>/device/queue_depth for ata devices
libata handles turning off ncq globally via kernel command line
(libata.force=noncq) or sysfs (echo 1 >
/sys/block/<sdX>/device/queue_depth). A lldd specific compile option is
not necessary.
Cc: Jack Wang <jack_wang@usish.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/pm8001/pm8001_sas.c')
-rw-r--r-- | drivers/scsi/pm8001/pm8001_sas.c | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c index 7dbbf8bb4d8..9068f123ecc 100644 --- a/drivers/scsi/pm8001/pm8001_sas.c +++ b/drivers/scsi/pm8001/pm8001_sas.c | |||
@@ -216,20 +216,6 @@ int pm8001_phy_control(struct asd_sas_phy *sas_phy, enum phy_func func, | |||
216 | return rc; | 216 | return rc; |
217 | } | 217 | } |
218 | 218 | ||
219 | int pm8001_slave_alloc(struct scsi_device *scsi_dev) | ||
220 | { | ||
221 | struct domain_device *dev = sdev_to_domain_dev(scsi_dev); | ||
222 | if (dev_is_sata(dev)) { | ||
223 | /* We don't need to rescan targets | ||
224 | * if REPORT_LUNS request is failed | ||
225 | */ | ||
226 | if (scsi_dev->lun > 0) | ||
227 | return -ENXIO; | ||
228 | scsi_dev->tagged_supported = 1; | ||
229 | } | ||
230 | return sas_slave_alloc(scsi_dev); | ||
231 | } | ||
232 | |||
233 | /** | 219 | /** |
234 | * pm8001_scan_start - we should enable all HBA phys by sending the phy_start | 220 | * pm8001_scan_start - we should enable all HBA phys by sending the phy_start |
235 | * command to HBA. | 221 | * command to HBA. |
@@ -314,22 +300,7 @@ static int pm8001_task_prep_ssp(struct pm8001_hba_info *pm8001_ha, | |||
314 | { | 300 | { |
315 | return PM8001_CHIP_DISP->ssp_io_req(pm8001_ha, ccb); | 301 | return PM8001_CHIP_DISP->ssp_io_req(pm8001_ha, ccb); |
316 | } | 302 | } |
317 | int pm8001_slave_configure(struct scsi_device *sdev) | 303 | |
318 | { | ||
319 | struct domain_device *dev = sdev_to_domain_dev(sdev); | ||
320 | int ret = sas_slave_configure(sdev); | ||
321 | if (ret) | ||
322 | return ret; | ||
323 | if (dev_is_sata(dev)) { | ||
324 | #ifdef PM8001_DISABLE_NCQ | ||
325 | struct ata_port *ap = dev->sata_dev.ap; | ||
326 | struct ata_device *adev = ap->link.device; | ||
327 | adev->flags |= ATA_DFLAG_NCQ_OFF; | ||
328 | scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG, 1); | ||
329 | #endif | ||
330 | } | ||
331 | return 0; | ||
332 | } | ||
333 | /* Find the local port id that's attached to this device */ | 304 | /* Find the local port id that's attached to this device */ |
334 | static int sas_find_local_port_id(struct domain_device *dev) | 305 | static int sas_find_local_port_id(struct domain_device *dev) |
335 | { | 306 | { |