diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2011-05-08 15:49:15 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 04:04:47 -0700 |
| commit | ce2b3261b6765c3b80fda95426c73e8d3bb1b035 (patch) | |
| tree | 98d2007abbe37e70ec29e01cd4752fc04442085f /drivers/scsi/isci/host.h | |
| parent | 67ea838d17acdad3331aeae848683c768df96aaa (diff) | |
| download | linux-3.10-ce2b3261b6765c3b80fda95426c73e8d3bb1b035.tar.gz linux-3.10-ce2b3261b6765c3b80fda95426c73e8d3bb1b035.tar.bz2 linux-3.10-ce2b3261b6765c3b80fda95426c73e8d3bb1b035.zip | |
isci: unify constants
cross driver constants are spread out over multiple header files, consolidate
them into isci.h, and push some includes out to the source files that need
them.
TODO: remove SCI_MODE_SIZE infrastructure.
TODO: task.h is full of inlines that are too large
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 | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/drivers/scsi/isci/host.h b/drivers/scsi/isci/host.h index afa41e83eaa..13c1c99ef29 100644 --- a/drivers/scsi/isci/host.h +++ b/drivers/scsi/isci/host.h @@ -53,26 +53,12 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -#if !defined(_SCI_HOST_H_) +#ifndef _SCI_HOST_H_ #define _SCI_HOST_H_ -#include "phy.h" #include "scic_sds_controller.h" -#include "timers.h" #include "remote_device.h" - -#define DRV_NAME "isci" -#define SCI_PCI_BAR_COUNT 2 -#define SCI_NUM_MSI_X_INT 2 -#define SCI_SMU_BAR 0 -#define SCI_SMU_BAR_SIZE (16*1024) -#define SCI_SCU_BAR 1 -#define SCI_SCU_BAR_SIZE (4*1024*1024) -#define SCI_IO_SPACE_BAR0 2 -#define SCI_IO_SPACE_BAR1 3 -#define ISCI_CAN_QUEUE_VAL 250 /* < SCI_MAX_IO_REQUESTS ? */ -#define SCIC_CONTROLLER_STOP_TIMEOUT 5000 +#include "phy.h" struct isci_host { struct scic_sds_controller sci; |