diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2012-02-01 00:23:10 -0800 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2012-05-17 12:27:11 -0700 |
| commit | 11cc51835af0e6fbb2da9cb012bdaaa036497b7f (patch) | |
| tree | c9afaa1c1afc1e185b85fa6137e60282657e1778 /drivers/scsi/isci/host.h | |
| parent | 14e99b4a3f5323bb961754de5024daff79e59b98 (diff) | |
| download | linux-11cc51835af0e6fbb2da9cb012bdaaa036497b7f.tar.bz2 | |
isci: kill ->is_direct_attached
domain_device ->parent conveys the same information.
Occurrences of ->is_direct_attached appear next to incomplete open-coded
versions of dev_is_sata(), clean those up as well.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/host.h')
| -rw-r--r-- | drivers/scsi/isci/host.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/isci/host.h b/drivers/scsi/isci/host.h index adbad69d1069..a9679ee7084b 100644 --- a/drivers/scsi/isci/host.h +++ b/drivers/scsi/isci/host.h @@ -55,6 +55,7 @@ #ifndef _SCI_HOST_H_ #define _SCI_HOST_H_ +#include <scsi/sas_ata.h> #include "remote_device.h" #include "phy.h" #include "isci.h" @@ -378,8 +379,7 @@ static inline int sci_remote_device_node_count(struct isci_remote_device *idev) { struct domain_device *dev = idev->domain_dev; - if ((dev->dev_type == SATA_DEV || (dev->tproto & SAS_PROTOCOL_STP)) && - !idev->is_direct_attached) + if (dev_is_sata(dev) && dev->parent) return SCU_STP_REMOTE_NODE_COUNT; return SCU_SSP_REMOTE_NODE_COUNT; } |