diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2012-02-01 09:23:10 +0100 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2012-05-17 21:27:11 +0200 |
| commit | 11cc51835af0e6fbb2da9cb012bdaaa036497b7f (patch) | |
| tree | c9afaa1c1afc1e185b85fa6137e60282657e1778 /drivers/scsi/isci/request.c | |
| parent | isci: improve 'invalid state' warnings (diff) | |
| download | linux-11cc51835af0e6fbb2da9cb012bdaaa036497b7f.tar.xz linux-11cc51835af0e6fbb2da9cb012bdaaa036497b7f.zip | |
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/request.c')
| -rw-r--r-- | drivers/scsi/isci/request.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/isci/request.c b/drivers/scsi/isci/request.c index 2def1e3960f6..01844ef19656 100644 --- a/drivers/scsi/isci/request.c +++ b/drivers/scsi/isci/request.c @@ -3193,7 +3193,7 @@ sci_io_request_construct(struct isci_host *ihost, if (dev->dev_type == SAS_END_DEV) /* pass */; - else if (dev->dev_type == SATA_DEV || (dev->tproto & SAS_PROTOCOL_STP)) + else if (dev_is_sata(dev)) memset(&ireq->stp.cmd, 0, sizeof(ireq->stp.cmd)); else if (dev_is_expander(dev)) /* pass */; @@ -3215,8 +3215,7 @@ enum sci_status sci_task_request_construct(struct isci_host *ihost, /* Build the common part of the request */ sci_general_request_construct(ihost, idev, ireq); - if (dev->dev_type == SAS_END_DEV || - dev->dev_type == SATA_DEV || (dev->tproto & SAS_PROTOCOL_STP)) { + if (dev->dev_type == SAS_END_DEV || dev_is_sata(dev)) { set_bit(IREQ_TMF, &ireq->flags); memset(ireq->tc, 0, sizeof(struct scu_task_context)); } else |