summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/isci/request.c
diff options
context:
space:
mode:
authorDan Williams2011-03-31 22:10:44 +0200
committerDan Williams2011-07-03 13:00:36 +0200
commit4393aa4e6b9517a666f0ef6b774fd421a9dc4c68 (patch)
treeec5e0c222d16f2368e5589a11fc4ec191ceca365 /drivers/scsi/isci/request.c
parentisci: cleanup isci_remote_device[_not]_ready interface (diff)
downloadkernel-qcow2-linux-4393aa4e6b9517a666f0ef6b774fd421a9dc4c68.tar.gz
kernel-qcow2-linux-4393aa4e6b9517a666f0ef6b774fd421a9dc4c68.tar.xz
kernel-qcow2-linux-4393aa4e6b9517a666f0ef6b774fd421a9dc4c68.zip
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>
Diffstat (limited to 'drivers/scsi/isci/request.c')
-rw-r--r--drivers/scsi/isci/request.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/isci/request.c b/drivers/scsi/isci/request.c
index b519373597a5..37ffedc94ac0 100644
--- a/drivers/scsi/isci/request.c
+++ b/drivers/scsi/isci/request.c
@@ -379,7 +379,7 @@ int isci_request_execute(
struct isci_request *request;
unsigned long flags;
- isci_device = isci_dev_from_domain_dev(task->dev);
+ isci_device = task->dev->lldd_dev;
sci_device = to_sci_dev(isci_device);
/* do common allocation and init of request object. */