diff options
author | Maciej Patelczyk <maciej.patelczyk@intel.com> | 2011-04-28 18:06:11 -0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 07:00:38 -0400 |
commit | e1e72a00dd9db0cd2b7d106916645626f53c0382 (patch) | |
tree | bd10e14596426f86f8ff3789e7fa2b2a4a4ccca5 /drivers/scsi/isci/phy.c | |
parent | d3757c3aeb75259e0b86a872e98841a2ea4cb5e8 (diff) |
isci: Removed sci_base_object from scic_sds_phy.
The 'struct sci_base_object' was removed from the struct
scic_sds_phy and was replaced by a pointer to
struct isci_phy.
Signed-off-by: Maciej Patelczyk <maciej.patelczyk@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/phy.c')
-rw-r--r-- | drivers/scsi/isci/phy.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/isci/phy.c b/drivers/scsi/isci/phy.c index 9e081a4c8a3c..a690b6b664f7 100644 --- a/drivers/scsi/isci/phy.c +++ b/drivers/scsi/isci/phy.c | |||
@@ -57,6 +57,7 @@ | |||
57 | #include "phy.h" | 57 | #include "phy.h" |
58 | #include "scic_port.h" | 58 | #include "scic_port.h" |
59 | #include "scic_config_parameters.h" | 59 | #include "scic_config_parameters.h" |
60 | #include "core/scic_sds_phy.h" | ||
60 | 61 | ||
61 | struct scic_sds_phy; | 62 | struct scic_sds_phy; |
62 | extern enum sci_status scic_sds_phy_start(struct scic_sds_phy *sci_phy); | 63 | extern enum sci_status scic_sds_phy_start(struct scic_sds_phy *sci_phy); |
@@ -88,8 +89,8 @@ void isci_phy_init( | |||
88 | 89 | ||
89 | status = scic_controller_get_phy_handle(scic, index, &scic_phy); | 90 | status = scic_controller_get_phy_handle(scic, index, &scic_phy); |
90 | if (status == SCI_SUCCESS) { | 91 | if (status == SCI_SUCCESS) { |
91 | sci_object_set_association(scic_phy, (void *)phy); | ||
92 | phy->sci_phy_handle = scic_phy; | 92 | phy->sci_phy_handle = scic_phy; |
93 | scic_phy->iphy = phy; | ||
93 | } else | 94 | } else |
94 | dev_err(&isci_host->pdev->dev, | 95 | dev_err(&isci_host->pdev->dev, |
95 | "failed scic_controller_get_phy_handle\n"); | 96 | "failed scic_controller_get_phy_handle\n"); |