isci: fix fragile/conditional isci_host lookups

A domain_device can always reference back to ->lldd_ha unlike local lldd
structures.  Fix up cases where the driver uses local objects to look up the
isci_host.  This also changes the calling conventions of some routines to
expect a valid isci_host parameter rather than re-lookup the pointer on entry.

Incidentally cleans up some macros that are longer to type than the open-coded
equivalent:
  isci_host_from_sas_ha
  isci_dev_from_domain_dev

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

diff --git a/drivers/scsi/isci/host.c b/drivers/scsi/isci/host.c
index 79515be..6644959 100644 (file)
--- a/drivers/scsi/isci/host.c
+++ b/drivers/scsi/isci/host.c
@@ -129,7 +129,7 @@ void isci_host_start_complete(struct isci_host *ihost, enum sci_status completio
 
 int isci_host_scan_finished(struct Scsi_Host *shost, unsigned long time)
 {
-       struct isci_host *ihost = isci_host_from_sas_ha(SHOST_TO_SAS_HA(shost));
+       struct isci_host *ihost = SHOST_TO_SAS_HA(shost)->lldd_ha;
 
        if (test_bit(IHOST_START_PENDING, &ihost->flags))
                return 0;
@@ -149,7 +149,7 @@ int isci_host_scan_finished(struct Scsi_Host *shost, unsigned long time)
 
 void isci_host_scan_start(struct Scsi_Host *shost)
 {
-       struct isci_host *ihost = isci_host_from_sas_ha(SHOST_TO_SAS_HA(shost));
+       struct isci_host *ihost = SHOST_TO_SAS_HA(shost)->lldd_ha;
        struct scic_sds_controller *scic = ihost->core_controller;
        unsigned long tmo = scic_controller_get_suggested_start_timeout(scic);
 

diff --cc drivers/scsi/isci/host.h
Simple merge

diff --cc drivers/scsi/isci/phy.c
Simple merge

diff --cc drivers/scsi/isci/port.c
Simple merge

diff --cc drivers/scsi/isci/port.h
Simple merge

diff --cc drivers/scsi/isci/remote_device.c
Simple merge

diff --cc drivers/scsi/isci/remote_device.h
Simple merge

diff --cc drivers/scsi/isci/request.c
Simple merge

diff --cc drivers/scsi/isci/task.c
Simple merge