summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/isci/port.c
diff options
context:
space:
mode:
authorMaciej Patelczyk <maciej.patelczyk@intel.com>2011-04-28 22:06:06 +0000
committerDan Williams <dan.j.williams@intel.com>2011-07-03 04:00:38 -0700
commitd3757c3aeb75259e0b86a872e98841a2ea4cb5e8 (patch)
treee2484fe1e6601fd343b950280c388586a4217a4c /drivers/scsi/isci/port.c
parent9a0fff7bf0ffd4f57fc71d8075a92008b606eb61 (diff)
downloadop-kernel-dev-d3757c3aeb75259e0b86a872e98841a2ea4cb5e8.zip
op-kernel-dev-d3757c3aeb75259e0b86a872e98841a2ea4cb5e8.tar.gz
isci: Removed sci_base_object from scic_sds_controller.
The 'struct sci_base_object' was removed from the struct scic_sds_controller and was replaced by a pointer to struct isci_host. 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/port.c')
-rw-r--r--drivers/scsi/isci/port.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/isci/port.c b/drivers/scsi/isci/port.c
index 430b29e..c0916b1 100644
--- a/drivers/scsi/isci/port.c
+++ b/drivers/scsi/isci/port.c
@@ -68,6 +68,7 @@
#include "scic_port.h"
#include "port.h"
#include "request.h"
+#include "core/scic_sds_controller.h"
static void isci_port_change_state(
struct isci_port *isci_port,
@@ -472,7 +473,7 @@ void isci_port_invalid_link_up(struct scic_sds_controller *scic,
struct scic_sds_port *sci_port,
struct scic_sds_phy *phy)
{
- struct isci_host *ihost = sci_object_get_association(scic);
+ struct isci_host *ihost = scic->ihost;
dev_warn(&ihost->pdev->dev, "Invalid link up!\n");
}
@@ -481,7 +482,7 @@ void isci_port_stop_complete(struct scic_sds_controller *scic,
struct scic_sds_port *sci_port,
enum sci_status completion_status)
{
- struct isci_host *ihost = sci_object_get_association(scic);
+ struct isci_host *ihost = scic->ihost;
dev_dbg(&ihost->pdev->dev, "Port stop complete\n");
}
OpenPOWER on IntegriCloud