.. | .. |
---|
160 | 160 | |
---|
161 | 161 | isci_task_refuse(ihost, task, |
---|
162 | 162 | SAS_TASK_UNDELIVERED, |
---|
163 | | - SAM_STAT_TASK_ABORTED); |
---|
| 163 | + SAS_SAM_STAT_TASK_ABORTED); |
---|
164 | 164 | } else { |
---|
165 | 165 | task->task_state_flags |= SAS_TASK_AT_INITIATOR; |
---|
166 | 166 | spin_unlock_irqrestore(&task->task_state_lock, flags); |
---|
.. | .. |
---|
511 | 511 | "%s: dev = %p (%s%s), task = %p, old_request == %p\n", |
---|
512 | 512 | __func__, idev, |
---|
513 | 513 | (dev_is_sata(task->dev) ? "STP/SATA" |
---|
514 | | - : ((dev_is_expander(task->dev)) |
---|
| 514 | + : ((dev_is_expander(task->dev->dev_type)) |
---|
515 | 515 | ? "SMP" |
---|
516 | 516 | : "SSP")), |
---|
517 | 517 | ((idev) ? ((test_bit(IDEV_GONE, &idev->flags)) |
---|