.. | .. |
---|
224 | 224 | idev = ireq->target_device; |
---|
225 | 225 | iport = idev->owning_port; |
---|
226 | 226 | |
---|
227 | | - /* Fill in the TC with the its required data */ |
---|
| 227 | + /* Fill in the TC with its required data */ |
---|
228 | 228 | task_context->abort = 0; |
---|
229 | 229 | task_context->priority = 0; |
---|
230 | 230 | task_context->initiator_request = 1; |
---|
.. | .. |
---|
506 | 506 | idev = ireq->target_device; |
---|
507 | 507 | iport = idev->owning_port; |
---|
508 | 508 | |
---|
509 | | - /* Fill in the TC with the its required data */ |
---|
| 509 | + /* Fill in the TC with its required data */ |
---|
510 | 510 | task_context->abort = 0; |
---|
511 | 511 | task_context->priority = SCU_TASK_PRIORITY_NORMAL; |
---|
512 | 512 | task_context->initiator_request = 1; |
---|
.. | .. |
---|
894 | 894 | * and don't wait for the task response. |
---|
895 | 895 | */ |
---|
896 | 896 | sci_change_state(&ireq->sm, SCI_REQ_ABORTING); |
---|
897 | | - /* Fall through and handle like ABORTING... */ |
---|
| 897 | + fallthrough; /* and handle like ABORTING */ |
---|
898 | 898 | case SCI_REQ_ABORTING: |
---|
899 | 899 | if (!isci_remote_device_is_safe_to_abort(ireq->target_device)) |
---|
900 | 900 | set_bit(IREQ_PENDING_ABORT, &ireq->flags); |
---|
.. | .. |
---|
2574 | 2574 | if (!idev) |
---|
2575 | 2575 | *status_ptr = SAS_DEVICE_UNKNOWN; |
---|
2576 | 2576 | else |
---|
2577 | | - *status_ptr = SAM_STAT_TASK_ABORTED; |
---|
| 2577 | + *status_ptr = SAS_SAM_STAT_TASK_ABORTED; |
---|
2578 | 2578 | |
---|
2579 | 2579 | clear_bit(IREQ_COMPLETE_IN_TARGET, &request->flags); |
---|
2580 | 2580 | } |
---|
.. | .. |
---|
2704 | 2704 | default: |
---|
2705 | 2705 | /* Task in the target is not done. */ |
---|
2706 | 2706 | *response_ptr = SAS_TASK_UNDELIVERED; |
---|
2707 | | - *status_ptr = SAM_STAT_TASK_ABORTED; |
---|
| 2707 | + *status_ptr = SAS_SAM_STAT_TASK_ABORTED; |
---|
2708 | 2708 | |
---|
2709 | 2709 | if (task->task_proto == SAS_PROTOCOL_SMP) |
---|
2710 | 2710 | set_bit(IREQ_COMPLETE_IN_TARGET, &request->flags); |
---|
.. | .. |
---|
2727 | 2727 | if (ac_err_mask(fis->status)) |
---|
2728 | 2728 | ts->stat = SAS_PROTO_RESPONSE; |
---|
2729 | 2729 | else |
---|
2730 | | - ts->stat = SAM_STAT_GOOD; |
---|
| 2730 | + ts->stat = SAS_SAM_STAT_GOOD; |
---|
2731 | 2731 | |
---|
2732 | 2732 | ts->resp = SAS_TASK_COMPLETE; |
---|
2733 | 2733 | } |
---|
.. | .. |
---|
2790 | 2790 | case SCI_IO_SUCCESS_IO_DONE_EARLY: |
---|
2791 | 2791 | |
---|
2792 | 2792 | response = SAS_TASK_COMPLETE; |
---|
2793 | | - status = SAM_STAT_GOOD; |
---|
| 2793 | + status = SAS_SAM_STAT_GOOD; |
---|
2794 | 2794 | set_bit(IREQ_COMPLETE_IN_TARGET, &request->flags); |
---|
2795 | 2795 | |
---|
2796 | 2796 | if (completion_status == SCI_IO_SUCCESS_IO_DONE_EARLY) { |
---|
.. | .. |
---|
2860 | 2860 | |
---|
2861 | 2861 | /* Fail the I/O. */ |
---|
2862 | 2862 | response = SAS_TASK_UNDELIVERED; |
---|
2863 | | - status = SAM_STAT_TASK_ABORTED; |
---|
| 2863 | + status = SAS_SAM_STAT_TASK_ABORTED; |
---|
2864 | 2864 | |
---|
2865 | 2865 | clear_bit(IREQ_COMPLETE_IN_TARGET, &request->flags); |
---|
2866 | 2866 | break; |
---|
.. | .. |
---|
3101 | 3101 | /* pass */; |
---|
3102 | 3102 | else if (dev_is_sata(dev)) |
---|
3103 | 3103 | memset(&ireq->stp.cmd, 0, sizeof(ireq->stp.cmd)); |
---|
3104 | | - else if (dev_is_expander(dev)) |
---|
| 3104 | + else if (dev_is_expander(dev->dev_type)) |
---|
3105 | 3105 | /* pass */; |
---|
3106 | 3106 | else |
---|
3107 | 3107 | return SCI_FAILURE_UNSUPPORTED_PROTOCOL; |
---|
.. | .. |
---|
3235 | 3235 | iport = idev->owning_port; |
---|
3236 | 3236 | |
---|
3237 | 3237 | /* |
---|
3238 | | - * Fill in the TC with the its required data |
---|
| 3238 | + * Fill in the TC with its required data |
---|
3239 | 3239 | * 00h |
---|
3240 | 3240 | */ |
---|
3241 | 3241 | task_context->priority = 0; |
---|
.. | .. |
---|
3444 | 3444 | int isci_request_execute(struct isci_host *ihost, struct isci_remote_device *idev, |
---|
3445 | 3445 | struct sas_task *task, u16 tag) |
---|
3446 | 3446 | { |
---|
3447 | | - enum sci_status status = SCI_FAILURE_UNSUPPORTED_PROTOCOL; |
---|
| 3447 | + enum sci_status status; |
---|
3448 | 3448 | struct isci_request *ireq; |
---|
3449 | 3449 | unsigned long flags; |
---|
3450 | 3450 | int ret = 0; |
---|