diff options
author | Dan Williams <dan.j.williams@intel.com> | 2012-02-17 19:30:47 -0500 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2012-05-17 15:27:12 -0400 |
commit | ae904d15cf344bcb426f63982016f6bacc45825b (patch) | |
tree | 76b31d9458213ed3f57656d7e74ea862c41ef04d /drivers/scsi | |
parent | 1844e4789fe5c97a9ff3bb82628111abbe7cc846 (diff) |
isci: kill isci_port.domain_dev_list
Another unused field, and isci_port_init is overkill.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/isci/host.c | 8 | ||||
-rw-r--r-- | drivers/scsi/isci/port.c | 7 | ||||
-rw-r--r-- | drivers/scsi/isci/port.h | 6 |
3 files changed, 6 insertions, 15 deletions
diff --git a/drivers/scsi/isci/host.c b/drivers/scsi/isci/host.c index d647b07ba1a3..bbec1982d07f 100644 --- a/drivers/scsi/isci/host.c +++ b/drivers/scsi/isci/host.c | |||
@@ -2557,8 +2557,12 @@ int isci_host_init(struct isci_host *ihost) | |||
2557 | if (err) | 2557 | if (err) |
2558 | return err; | 2558 | return err; |
2559 | 2559 | ||
2560 | for (i = 0; i < SCI_MAX_PORTS; i++) | 2560 | for (i = 0; i < SCI_MAX_PORTS; i++) { |
2561 | isci_port_init(&ihost->ports[i], ihost, i); | 2561 | struct isci_port *iport = &ihost->ports[i]; |
2562 | |||
2563 | INIT_LIST_HEAD(&iport->remote_dev_list); | ||
2564 | iport->isci_host = ihost; | ||
2565 | } | ||
2562 | 2566 | ||
2563 | for (i = 0; i < SCI_MAX_PHYS; i++) | 2567 | for (i = 0; i < SCI_MAX_PHYS; i++) |
2564 | isci_phy_init(&ihost->phys[i], ihost, i); | 2568 | isci_phy_init(&ihost->phys[i], ihost, i); |
diff --git a/drivers/scsi/isci/port.c b/drivers/scsi/isci/port.c index 923579fa0292..6ef4bd910f33 100644 --- a/drivers/scsi/isci/port.c +++ b/drivers/scsi/isci/port.c | |||
@@ -1606,13 +1606,6 @@ void sci_port_construct(struct isci_port *iport, u8 index, | |||
1606 | iport->phy_table[index] = NULL; | 1606 | iport->phy_table[index] = NULL; |
1607 | } | 1607 | } |
1608 | 1608 | ||
1609 | void isci_port_init(struct isci_port *iport, struct isci_host *ihost, int index) | ||
1610 | { | ||
1611 | INIT_LIST_HEAD(&iport->remote_dev_list); | ||
1612 | INIT_LIST_HEAD(&iport->domain_dev_list); | ||
1613 | iport->isci_host = ihost; | ||
1614 | } | ||
1615 | |||
1616 | void sci_port_broadcast_change_received(struct isci_port *iport, struct isci_phy *iphy) | 1609 | void sci_port_broadcast_change_received(struct isci_port *iport, struct isci_phy *iphy) |
1617 | { | 1610 | { |
1618 | struct isci_host *ihost = iport->owning_controller; | 1611 | struct isci_host *ihost = iport->owning_controller; |
diff --git a/drivers/scsi/isci/port.h b/drivers/scsi/isci/port.h index 6b56240c2051..f8bd1e8dbfea 100644 --- a/drivers/scsi/isci/port.h +++ b/drivers/scsi/isci/port.h | |||
@@ -97,7 +97,6 @@ enum isci_status { | |||
97 | struct isci_port { | 97 | struct isci_port { |
98 | struct isci_host *isci_host; | 98 | struct isci_host *isci_host; |
99 | struct list_head remote_dev_list; | 99 | struct list_head remote_dev_list; |
100 | struct list_head domain_dev_list; | ||
101 | #define IPORT_RESET_PENDING 0 | 100 | #define IPORT_RESET_PENDING 0 |
102 | unsigned long state; | 101 | unsigned long state; |
103 | enum sci_status hard_reset_status; | 102 | enum sci_status hard_reset_status; |
@@ -273,11 +272,6 @@ void sci_port_get_attached_sas_address( | |||
273 | void isci_port_formed(struct asd_sas_phy *); | 272 | void isci_port_formed(struct asd_sas_phy *); |
274 | void isci_port_deformed(struct asd_sas_phy *); | 273 | void isci_port_deformed(struct asd_sas_phy *); |
275 | 274 | ||
276 | void isci_port_init( | ||
277 | struct isci_port *port, | ||
278 | struct isci_host *host, | ||
279 | int index); | ||
280 | |||
281 | int isci_port_perform_hard_reset(struct isci_host *ihost, struct isci_port *iport, | 275 | int isci_port_perform_hard_reset(struct isci_host *ihost, struct isci_port *iport, |
282 | struct isci_phy *iphy); | 276 | struct isci_phy *iphy); |
283 | int isci_ata_check_ready(struct domain_device *dev); | 277 | int isci_ata_check_ready(struct domain_device *dev); |