isci: kill smp_discover_response_protocols in favor of domain_device.dev_type
This is step 1 of removing the contortions to:
1/ unparse expander phy data into a smp discover frame
2/ open-code-parse the smp discover fram into a domain_device.dev_type equivalent
libsas has already spent cycles determining the dev_type, so now that
scic_sds_remote_device is unified with isci_remote_device we can
directly reference dev_type.
This might also change multi-level expander detection as we previously only
looked at dev_type == EDGE_DEV and we did not consider the FANOUT_DEV case.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
diff --git a/drivers/scsi/isci/request.c b/drivers/scsi/isci/request.c
index ff5c05a..281a556 100644
--- a/drivers/scsi/isci/request.c
+++ b/drivers/scsi/isci/request.c
@@ -175,7 +175,6 @@
struct isci_request *request,
struct isci_remote_device *isci_device)
{
- struct smp_discover_response_protocols dev_protocols;
enum sci_status status = SCI_SUCCESS;
struct sas_task *task = isci_request_access_task(request);
struct scic_sds_remote_device *sci_device = &isci_device->sci;
@@ -228,15 +227,19 @@
sci_object_set_association(request->sci_request_handle, request);
- /* Determine protocol and call the appropriate basic constructor */
- scic_remote_device_get_protocols(sci_device, &dev_protocols);
- if (dev_protocols.u.bits.attached_ssp_target)
- status = isci_request_ssp_request_construct(request);
- else if (dev_protocols.u.bits.attached_stp_target)
- status = isci_request_stp_request_construct(request);
- else if (dev_protocols.u.bits.attached_smp_target)
+ switch (task->task_proto) {
+ case SAS_PROTOCOL_SMP:
status = isci_smp_request_build(request);
- else {
+ break;
+ case SAS_PROTOCOL_SSP:
+ status = isci_request_ssp_request_construct(request);
+ break;
+ case SAS_PROTOCOL_SATA:
+ case SAS_PROTOCOL_STP:
+ case SAS_PROTOCOL_SATA | SAS_PROTOCOL_STP:
+ status = isci_request_stp_request_construct(request);
+ break;
+ default:
dev_warn(&isci_host->pdev->dev,
"%s: unknown protocol\n", __func__);
return SCI_FAILURE;