Skip to content

Commit

Permalink
isci: kill isci_port.domain_dev_list
Browse files Browse the repository at this point in the history
Another unused field, and isci_port_init is overkill.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
  • Loading branch information
Dan Williams committed May 17, 2012
1 parent 1844e47 commit ae904d1
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 15 deletions.
8 changes: 6 additions & 2 deletions drivers/scsi/isci/host.c
Original file line number Diff line number Diff line change
Expand Up @@ -2557,8 +2557,12 @@ int isci_host_init(struct isci_host *ihost)
if (err)
return err;

for (i = 0; i < SCI_MAX_PORTS; i++)
isci_port_init(&ihost->ports[i], ihost, i);
for (i = 0; i < SCI_MAX_PORTS; i++) {
struct isci_port *iport = &ihost->ports[i];

INIT_LIST_HEAD(&iport->remote_dev_list);
iport->isci_host = ihost;
}

for (i = 0; i < SCI_MAX_PHYS; i++)
isci_phy_init(&ihost->phys[i], ihost, i);
Expand Down
7 changes: 0 additions & 7 deletions drivers/scsi/isci/port.c
Original file line number Diff line number Diff line change
Expand Up @@ -1606,13 +1606,6 @@ void sci_port_construct(struct isci_port *iport, u8 index,
iport->phy_table[index] = NULL;
}

void isci_port_init(struct isci_port *iport, struct isci_host *ihost, int index)
{
INIT_LIST_HEAD(&iport->remote_dev_list);
INIT_LIST_HEAD(&iport->domain_dev_list);
iport->isci_host = ihost;
}

void sci_port_broadcast_change_received(struct isci_port *iport, struct isci_phy *iphy)
{
struct isci_host *ihost = iport->owning_controller;
Expand Down
6 changes: 0 additions & 6 deletions drivers/scsi/isci/port.h
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ enum isci_status {
struct isci_port {
struct isci_host *isci_host;
struct list_head remote_dev_list;
struct list_head domain_dev_list;
#define IPORT_RESET_PENDING 0
unsigned long state;
enum sci_status hard_reset_status;
Expand Down Expand Up @@ -273,11 +272,6 @@ void sci_port_get_attached_sas_address(
void isci_port_formed(struct asd_sas_phy *);
void isci_port_deformed(struct asd_sas_phy *);

void isci_port_init(
struct isci_port *port,
struct isci_host *host,
int index);

int isci_port_perform_hard_reset(struct isci_host *ihost, struct isci_port *iport,
struct isci_phy *iphy);
int isci_ata_check_ready(struct domain_device *dev);
Expand Down

0 comments on commit ae904d1

Please sign in to comment.