From: j00310691 <john.garry@huawei.com>
To: <JBottomley@odin.com>, <martin.petersen@oracle.com>,
<robh+dt@kernel.org>, <pawel.moll@arm.com>,
<mark.rutland@arm.com>, <ijc+devicetree@hellion.org.uk>,
<galak@codeaurora.org>
Cc: <linuxarm@huawei.com>, <zhangfei.gao@linaro.org>,
<xuwei5@hisilicon.com>, <john.garry2@mail.dcu.ie>,
<linux-scsi@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<arnd@arndb.de>, <devicetree@vger.kernel.org>,
John Garry <john.garry@huawei.com>
Subject: [PATCH v2 02/23] hisi_sas: relocate DEV_IS_EXPANDER
Date: Tue, 26 Jan 2016 01:21:51 +0800 [thread overview]
Message-ID: <1453742532-53092-3-git-send-email-john.garry@huawei.com> (raw)
In-Reply-To: <1453742532-53092-1-git-send-email-john.garry@huawei.com>
From: John Garry <john.garry@huawei.com>
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>
---
drivers/scsi/hisi_sas/hisi_sas.h | 4 ++++
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 5af2e41..21eb2bb 100644
--- a/drivers/scsi/hisi_sas/hisi_sas.h
+++ b/drivers/scsi/hisi_sas/hisi_sas.h
@@ -37,6 +37,10 @@
#define HISI_SAS_MAX_SSP_RESP_SZ (sizeof(struct ssp_frame_hdr) + 1024)
#define HISI_SAS_MAX_SMP_RESP_SZ 1028
+#define DEV_IS_EXPANDER(type) \
+ ((type == SAS_EDGE_EXPANDER_DEVICE) || \
+ (type == SAS_FANOUT_EXPANDER_DEVICE))
+
struct hisi_hba;
enum {
diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
index 99b1950..7689939 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -12,10 +12,6 @@
#include "hisi_sas.h"
#define DRV_NAME "hisi_sas"
-#define DEV_IS_EXPANDER(type) \
- ((type == SAS_EDGE_EXPANDER_DEVICE) || \
- (type == SAS_FANOUT_EXPANDER_DEVICE))
-
#define DEV_IS_GONE(dev) \
((!dev) || (dev->dev_type == SAS_PHY_UNUSED))
--
1.9.1
next prev parent reply other threads:[~2016-01-25 17:09 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-25 17:21 [PATCH v2 00/23] HiSilicon SAS v2 hw support j00310691
2016-01-25 17:21 ` [PATCH v2 01/23] devicetree: bindings: hisi_sas: add v2 HW bindings j00310691
2016-01-25 19:31 ` Rob Herring
2016-01-25 17:21 ` j00310691 [this message]
2016-01-25 17:21 ` [PATCH v2 03/23] hisi_sas: set max commands as configurable j00310691
2016-01-25 17:21 ` [PATCH v2 04/23] hisi_sas: reduce max itct entries j00310691
2016-01-25 17:21 ` [PATCH v2 05/23] hisi_sas: add hisi_sas_err_record_v1 j00310691
2016-01-25 17:21 ` [PATCH v2 06/23] hisi_sas: rename some fields in hisi_sas_itct j00310691
2016-01-25 17:21 ` [PATCH v2 07/23] hisi_sas: add bare v2 hw driver j00310691
2016-01-25 17:21 ` [PATCH v2 08/23] hisi_sas: add v2 register definitions j00310691
2016-01-25 17:21 ` [PATCH v2 09/23] hisi_sas: add v2 hw init j00310691
2016-01-25 17:21 ` [PATCH v2 10/23] hisi_sas: add init_id_frame_v2_hw() j00310691
2016-01-25 17:22 ` [PATCH v2 11/23] hisi_sas: add v2 phy init code j00310691
2016-01-25 17:22 ` [PATCH v2 12/23] hisi_sas: add v2 int init and phy up handler j00310691
2016-01-25 17:22 ` [PATCH v2 13/23] hisi_sas: add v2 phy down handler j00310691
2016-01-25 17:22 ` [PATCH v2 14/23] hisi_sas: add v2 channel interrupt handler j00310691
2016-01-25 17:22 ` [PATCH v2 15/23] hisi_sas: add v2 SATA " j00310691
2016-01-25 17:22 ` [PATCH v2 16/23] hisi_sas: add v2 cq " j00310691
2016-01-25 17:22 ` [PATCH v2 17/23] hisi_sas: add v2 path to send ssp frame j00310691
2016-01-25 17:22 ` [PATCH v2 18/23] hisi_sas: add v2 code to send smp command j00310691
2016-01-25 17:22 ` [PATCH v2 19/23] hisi_sas: add v2 code for itct setup and free j00310691
2016-01-25 17:22 ` [PATCH v2 20/23] hisi_sas: add v2 path to send ATA command j00310691
2016-01-25 17:22 ` [PATCH v2 21/23] hisi_sas: add v2 slot error handler j00310691
2016-01-25 17:22 ` [PATCH v2 22/23] hisi_sas: add v2 tmf functions j00310691
2016-01-25 17:22 ` [PATCH v2 23/23] hisi_sas: update driver version to 1.1 j00310691
2016-01-25 17:24 ` [PATCH v2 00/23] HiSilicon SAS v2 hw support John Garry
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1453742532-53092-3-git-send-email-john.garry@huawei.com \
--to=john.garry@huawei.com \
--cc=JBottomley@odin.com \
--cc=arnd@arndb.de \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=john.garry2@mail.dcu.ie \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=mark.rutland@arm.com \
--cc=martin.petersen@oracle.com \
--cc=pawel.moll@arm.com \
--cc=robh+dt@kernel.org \
--cc=xuwei5@hisilicon.com \
--cc=zhangfei.gao@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox