Skip to content

Commit

Permalink
isci: remove base_remote_device abstraction
Browse files Browse the repository at this point in the history
Merge struct sci_base_remote_device into scic_sds_remote_device.  As for
now sci_base_remote_device was accessed indirectly using
scic_sds_remote_device->parent field.  Both machine state handlers are
also merged together.

Reported-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Maciej Trela <Maciej.Trela@intel.com>
Signed-off-by: Maciej Patelczyk <maciej.patelczyk@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
  • Loading branch information
Maciej Trela authored and Dan Williams committed Jul 3, 2011
1 parent c629582 commit 0ea99d5
Show file tree
Hide file tree
Showing 6 changed files with 572 additions and 741 deletions.
274 changes: 0 additions & 274 deletions drivers/scsi/isci/core/sci_base_remote_device.h

This file was deleted.

8 changes: 4 additions & 4 deletions drivers/scsi/isci/core/scic_sds_controller.c
Original file line number Diff line number Diff line change
Expand Up @@ -1500,13 +1500,13 @@ void scic_sds_controller_link_down(struct scic_sds_controller *scic,
*
*/
static bool scic_sds_controller_has_remote_devices_stopping(
struct scic_sds_controller *this_controller)
struct scic_sds_controller *controller)
{
u32 index;

for (index = 0; index < this_controller->remote_node_entries; index++) {
if ((this_controller->device_table[index] != NULL) &&
(this_controller->device_table[index]->parent.state_machine.current_state_id
for (index = 0; index < controller->remote_node_entries; index++) {
if ((controller->device_table[index] != NULL) &&
(controller->device_table[index]->state_machine.current_state_id
== SCI_BASE_REMOTE_DEVICE_STATE_STOPPING))
return true;
}
Expand Down
Loading

0 comments on commit 0ea99d5

Please sign in to comment.