isci: kill scic_remote_device_get_connection_rate

A function call to dereference a pointer is a tad much.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/drivers/scsi/isci/core/scic_sds_request.c b/drivers/scsi/isci/core/scic_sds_request.c
index fba642881092e5928bdab4cfa36a210a308ce216..ffc16072d1da92f64acfd1d7bce0ed58dce3df6c 100644 (file)
--- a/drivers/scsi/isci/core/scic_sds_request.c
+++ b/drivers/scsi/isci/core/scic_sds_request.c
@@ -443,8 +443,7 @@ static void scu_ssp_reqeust_construct_task_context(
        task_context->abort = 0;
        task_context->priority = 0;
        task_context->initiator_request = 1;
-       task_context->connection_rate =
-               scic_remote_device_get_connection_rate(target_device);
+       task_context->connection_rate = target_device->connection_rate;
        task_context->protocol_engine_index =
                scic_sds_controller_get_protocol_engine_group(controller);
        task_context->logical_port_index =

diff --git a/drivers/scsi/isci/core/scic_sds_smp_request.c b/drivers/scsi/isci/core/scic_sds_smp_request.c
index fff86687c8bfee3ce3ffdf25f50653915001fae6..2815da288750d4873e66b8604102eec2acf5d5c3 100644 (file)
--- a/drivers/scsi/isci/core/scic_sds_smp_request.c
+++ b/drivers/scsi/isci/core/scic_sds_smp_request.c
@@ -193,8 +193,7 @@ static void scu_smp_request_construct_task_context(
         */
        task_context->priority = 0;
        task_context->initiator_request = 1;
-       task_context->connection_rate =
-               scic_remote_device_get_connection_rate(sci_dev);
+       task_context->connection_rate = sci_dev->connection_rate;
        task_context->protocol_engine_index =
                scic_sds_controller_get_protocol_engine_group(controller);
        task_context->logical_port_index =

diff --git a/drivers/scsi/isci/core/scic_sds_stp_request.c b/drivers/scsi/isci/core/scic_sds_stp_request.c
index ec215463092a6c5d7dd29f2f5a8e0b58e1aab060..8c980235ea41cfe0ec589df55097b5c459ab211c 100644 (file)
--- a/drivers/scsi/isci/core/scic_sds_stp_request.c
+++ b/drivers/scsi/isci/core/scic_sds_stp_request.c
@@ -181,8 +181,7 @@ static void scu_sata_reqeust_construct_task_context(
        task_context->abort = 0;
        task_context->priority = SCU_TASK_PRIORITY_NORMAL;
        task_context->initiator_request = 1;
-       task_context->connection_rate =
-               scic_remote_device_get_connection_rate(target_device);
+       task_context->connection_rate = target_device->connection_rate;
        task_context->protocol_engine_index =
                scic_sds_controller_get_protocol_engine_group(controller);
        task_context->logical_port_index =

diff --git a/drivers/scsi/isci/remote_device.c b/drivers/scsi/isci/remote_device.c
index f6da85e3f2af994a91a88020dc2b1165af6f3436..834a3feaca6310bc0a3726c4bac4f594e544e77f 100644 (file)
--- a/drivers/scsi/isci/remote_device.c
+++ b/drivers/scsi/isci/remote_device.c
@@ -152,22 +152,9 @@ enum sci_status scic_remote_device_reset_complete(
        return sci_dev->state_handlers->reset_complete_handler(sci_dev);
 }
 
-
-enum sas_linkrate scic_remote_device_get_connection_rate(
-       struct scic_sds_remote_device *sci_dev)
-{
-       return sci_dev->connection_rate;
-}
-
-/**
- *
- *
- * Remote device timer requirements
- */
 #define SCIC_SDS_REMOTE_DEVICE_MINIMUM_TIMER_COUNT (0)
 #define SCIC_SDS_REMOTE_DEVICE_MAXIMUM_TIMER_COUNT (SCI_MAX_REMOTE_DEVICES)
 
-
 /**
  *
  * @sci_dev: The remote device for which the suspend is being requested.

diff --git a/drivers/scsi/isci/remote_device.h b/drivers/scsi/isci/remote_device.h
index dda217a6bd3a1d7504843676f5c078eef225880b..fd24df31abd2038ea1c23bd3d8b59ac1849565ae 100644 (file)
--- a/drivers/scsi/isci/remote_device.h
+++ b/drivers/scsi/isci/remote_device.h
@@ -208,19 +208,6 @@ enum sci_status scic_remote_device_reset(
 enum sci_status scic_remote_device_reset_complete(
        struct scic_sds_remote_device *remote_device);
 
-
-
-/**
- * scic_remote_device_get_connection_rate() - This method simply returns the
- *    link rate at which communications to the remote device occur.
- * @remote_device: This parameter specifies the device for which to get the
- *    connection rate.
- *
- * Return the link rate at which we transfer for the supplied remote device.
- */
-enum sas_linkrate scic_remote_device_get_connection_rate(
-       struct scic_sds_remote_device *remote_device);
-
 #define scic_remote_device_is_atapi(device_handle) false
 
 /**