Skip to content

Commit

Permalink
isci: remove base_port abstraction
Browse files Browse the repository at this point in the history
Merge struct sci_base_port into scic_sds_port.  Until now sci_base_port
was referenced indirectly with scic_sds_port->parent field.

'sci_base_port' state machine handlers were also incorporated into
scic_sds_port handlers.

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 0ea99d5 commit 41e2b90
Show file tree
Hide file tree
Showing 5 changed files with 285 additions and 524 deletions.
187 changes: 0 additions & 187 deletions drivers/scsi/isci/core/sci_base_port.h

This file was deleted.

10 changes: 5 additions & 5 deletions drivers/scsi/isci/core/scic_sds_controller.c
Original file line number Diff line number Diff line change
Expand Up @@ -616,10 +616,10 @@ static enum sci_status scic_sds_controller_stop_ports(struct scic_sds_controller

for (index = 0; index < scic->logical_port_entries; index++) {
struct scic_sds_port *sci_port = &scic->port_table[index];
sci_base_port_handler_t stop;
scic_sds_port_handler_t stop;

stop = sci_port->state_handlers->parent.stop_handler;
port_status = stop(&sci_port->parent);
stop = sci_port->state_handlers->stop_handler;
port_status = stop(sci_port);

if ((port_status != SCI_SUCCESS) &&
(port_status != SCI_FAILURE_INVALID_STATE)) {
Expand Down Expand Up @@ -2860,8 +2860,8 @@ enum sci_status scic_controller_start(struct scic_sds_controller *scic,
for (index = 0; index < scic->logical_port_entries; index++) {
struct scic_sds_port *sci_port = &scic->port_table[index];

result = sci_port->state_handlers->parent.start_handler(
&sci_port->parent);
result = sci_port->state_handlers->start_handler(
sci_port);
if (result)
return result;
}
Expand Down
Loading

0 comments on commit 41e2b90

Please sign in to comment.