diff options
author | James Bottomley <JBottomley@Parallels.com> | 2014-12-18 14:56:29 +0100 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2014-12-18 14:56:29 +0100 |
commit | e61745769125a3c788e7aceb2a5fb680ebb461e6 (patch) | |
tree | c8219c31767c8d6a64938626dd93069847d1d5b8 /drivers/scsi/libsas | |
parent | scsi: blacklist RSOC for Microsoft iSCSI target devices (diff) | |
parent | storvsc: ring buffer failures may result in I/O freeze (diff) | |
download | linux-e61745769125a3c788e7aceb2a5fb680ebb461e6.tar.xz linux-e61745769125a3c788e7aceb2a5fb680ebb461e6.zip |
Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-linus
Diffstat (limited to 'drivers/scsi/libsas')
-rw-r--r-- | drivers/scsi/libsas/sas_scsi_host.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c index 72918d227ead..519dac4e341e 100644 --- a/drivers/scsi/libsas/sas_scsi_host.c +++ b/drivers/scsi/libsas/sas_scsi_host.c @@ -906,13 +906,6 @@ int sas_change_queue_depth(struct scsi_device *sdev, int depth) return scsi_change_queue_depth(sdev, depth); } -int sas_change_queue_type(struct scsi_device *scsi_dev, int type) -{ - if (dev_is_sata(sdev_to_domain_dev(scsi_dev))) - return -EINVAL; - return scsi_change_queue_type(scsi_dev, type); -} - int sas_bios_param(struct scsi_device *scsi_dev, struct block_device *bdev, sector_t capacity, int *hsc) @@ -1011,7 +1004,6 @@ EXPORT_SYMBOL_GPL(sas_queuecommand); EXPORT_SYMBOL_GPL(sas_target_alloc); EXPORT_SYMBOL_GPL(sas_slave_configure); EXPORT_SYMBOL_GPL(sas_change_queue_depth); -EXPORT_SYMBOL_GPL(sas_change_queue_type); EXPORT_SYMBOL_GPL(sas_bios_param); EXPORT_SYMBOL_GPL(sas_task_abort); EXPORT_SYMBOL_GPL(sas_phy_reset); |