diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2012-02-16 01:20:31 +0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2012-05-17 23:27:12 +0400 |
| commit | 1844e4789fe5c97a9ff3bb82628111abbe7cc846 (patch) | |
| tree | e0ee7084e73d91ef0c0ec29d078f85549d18679e /drivers/scsi/isci/host.h | |
| parent | 944b787d0a469a376f4d6699eb01138823197513 (diff) | |
| download | linux-1844e4789fe5c97a9ff3bb82628111abbe7cc846.tar.xz | |
isci: kill ->status, and ->state_lock in isci_host
They serve no incremental purpose over the existing sas_ha state.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/host.h')
| -rw-r--r-- | drivers/scsi/isci/host.h | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/drivers/scsi/isci/host.h b/drivers/scsi/isci/host.h index a9679ee7084b..81485b4a1a51 100644 --- a/drivers/scsi/isci/host.h +++ b/drivers/scsi/isci/host.h @@ -191,9 +191,7 @@ struct isci_host { struct asd_sas_port sas_ports[SCI_MAX_PORTS]; struct sas_ha_struct sas_ha; - spinlock_t state_lock; struct pci_dev *pdev; - enum isci_status status; #define IHOST_START_PENDING 0 #define IHOST_STOP_PENDING 1 unsigned long flags; @@ -315,27 +313,6 @@ static inline struct isci_pci_info *to_pci_info(struct pci_dev *pdev) id < ARRAY_SIZE(to_pci_info(pdev)->hosts) && ihost; \ ihost = to_pci_info(pdev)->hosts[++id]) -static inline enum isci_status isci_host_get_state(struct isci_host *isci_host) -{ - return isci_host->status; -} - -static inline void isci_host_change_state(struct isci_host *isci_host, - enum isci_status status) -{ - unsigned long flags; - - dev_dbg(&isci_host->pdev->dev, - "%s: isci_host = %p, state = 0x%x", - __func__, - isci_host, - status); - spin_lock_irqsave(&isci_host->state_lock, flags); - isci_host->status = status; - spin_unlock_irqrestore(&isci_host->state_lock, flags); - -} - static inline void wait_for_start(struct isci_host *ihost) { wait_event(ihost->eventq, !test_bit(IHOST_START_PENDING, &ihost->flags)); |