diff options
author | John Garry <john.garry@huawei.com> | 2016-01-25 13:47:02 -0500 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2016-02-23 21:27:02 -0500 |
commit | 98bf39fca9ef5a7fc80e8dca1f1ea739c49d4f25 (patch) | |
tree | 6d5b46c67674025929cb60607d69e812a358536d /drivers/scsi/hisi_sas | |
parent | 7d37d6b6b293c6a9da19978d5918b71ebc4fb2c9 (diff) |
hisi_sas: relocate DEV_IS_EXPANDER
Relocate DEV_IS_EXPANDER to hisi_sas.h as it will be required for v2 hw
support.
Signed-off-by: John Garry <john.garry@huawei.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/hisi_sas')
-rw-r--r-- | drivers/scsi/hisi_sas/hisi_sas.h | 4 | ||||
-rw-r--r-- | drivers/scsi/hisi_sas/hisi_sas_main.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h index 5af2e4187f01..21eb2bb1c1c8 100644 --- a/drivers/scsi/hisi_sas/hisi_sas.h +++ b/drivers/scsi/hisi_sas/hisi_sas.h | |||
@@ -37,6 +37,10 @@ | |||
37 | #define HISI_SAS_MAX_SSP_RESP_SZ (sizeof(struct ssp_frame_hdr) + 1024) | 37 | #define HISI_SAS_MAX_SSP_RESP_SZ (sizeof(struct ssp_frame_hdr) + 1024) |
38 | #define HISI_SAS_MAX_SMP_RESP_SZ 1028 | 38 | #define HISI_SAS_MAX_SMP_RESP_SZ 1028 |
39 | 39 | ||
40 | #define DEV_IS_EXPANDER(type) \ | ||
41 | ((type == SAS_EDGE_EXPANDER_DEVICE) || \ | ||
42 | (type == SAS_FANOUT_EXPANDER_DEVICE)) | ||
43 | |||
40 | struct hisi_hba; | 44 | struct hisi_hba; |
41 | 45 | ||
42 | enum { | 46 | enum { |
diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c index 99b1950d751c..768993958035 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c | |||
@@ -12,10 +12,6 @@ | |||
12 | #include "hisi_sas.h" | 12 | #include "hisi_sas.h" |
13 | #define DRV_NAME "hisi_sas" | 13 | #define DRV_NAME "hisi_sas" |
14 | 14 | ||
15 | #define DEV_IS_EXPANDER(type) \ | ||
16 | ((type == SAS_EDGE_EXPANDER_DEVICE) || \ | ||
17 | (type == SAS_FANOUT_EXPANDER_DEVICE)) | ||
18 | |||
19 | #define DEV_IS_GONE(dev) \ | 15 | #define DEV_IS_GONE(dev) \ |
20 | ((!dev) || (dev->dev_type == SAS_PHY_UNUSED)) | 16 | ((!dev) || (dev->dev_type == SAS_PHY_UNUSED)) |
21 | 17 | ||