isci: merge stp request substates into primary state machine

Remove usage of the request substate machine for stp requests, and kill
the request substate infrastructure.

Similar to the previous conversions this adds the substates to the
primary state machine and arranges for the 'started' state to transition
to the proper stp substate.

Reported-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --cc drivers/scsi/isci/Makefile
Simple merge

diff --cc drivers/scsi/isci/request.c
Simple merge

diff --cc drivers/scsi/isci/request.h
Simple merge

diff --cc drivers/scsi/isci/stp_request.c
Simple merge

diff --cc drivers/scsi/isci/stp_request.h
Simple merge