diff options
author | Dan Williams <dan.j.williams@intel.com> | 2011-04-27 16:32:45 -0700 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 04:00:39 -0700 |
commit | ab2e8f7d07f577ee39228fb3454b9f29eab0f312 (patch) | |
tree | 9f3fc14b955f689a29d6777349db0f49c8dcf3e0 /drivers/scsi/isci/Makefile | |
parent | be2f41c611b65353fa3ae0c155cf906b348dc864 (diff) |
isci: merge remote_device substates into a single state machine
A substate is just a state, so uplevel the smp and stp device substates.
Three tricks at work here:
1/ scic_sds_remote_device_ready_state_enter: needs to know the the device type
so it can immediately transition to a stp or smp ready substate.
2/ scic_sds_remote_device_ready_state_exit: needs to know the device type. In
the ssp case the device is no longer ready, in the stp, and smp case we have
simply exited to a ready "substate".
3/ scic_sds_remote_device_resume_complete_handler: The one location
where we directly check the current state against
SCI_BASE_REMOTE_DEVICE_STATE_READY needed to comprehend the possible ready
substates.
Reported-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/Makefile')
-rw-r--r-- | drivers/scsi/isci/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/isci/Makefile b/drivers/scsi/isci/Makefile index fc50ba34b13..c27d2599912 100644 --- a/drivers/scsi/isci/Makefile +++ b/drivers/scsi/isci/Makefile @@ -7,8 +7,6 @@ obj-$(CONFIG_SCSI_ISCI) += isci.o isci-objs := init.o phy.o request.o sata.o \ remote_device.o port.o timers.o \ host.o task.o probe_roms.o \ - stp_remote_device.o \ - smp_remote_device.o \ remote_node_context.o \ remote_node_table.o \ core/scic_sds_controller.o \ |