From: Brian Norris <computersforpeace@gmail.com>
To: Jeff Garzik <jgarzik@pobox.com>
Cc: linux-ide@vger.kernel.org,
Linux Kernel <linux-kernel@vger.kernel.org>,
Tejun Heo <tj@kernel.org>, Kevin Cernekee <cernekee@gmail.com>,
Brian Norris <computersforpeace@gmail.com>,
Lin Ming <ming.m.lin@intel.com>,
Norbert Preining <preining@logic.at>,
"Srivatsa S . Bhat" <srivatsa.bhat@linux.vnet.ibm.com>,
Valdis Kletnieks <valdis.kletnieks@vt.edu>,
"Rafael J . Wysocki" <rjw@sisk.pl>
Subject: [PATCH 2/3] ahci: move AHCI_HFLAGS() macro to ahci.h
Date: Mon, 20 Feb 2012 12:09:22 -0800 [thread overview]
Message-ID: <1329768563-13715-3-git-send-email-computersforpeace@gmail.com> (raw)
In-Reply-To: <1329768563-13715-1-git-send-email-computersforpeace@gmail.com>
We will need this macro in both ahci.c and ahci_platform.c, so just move it
to the header.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
---
drivers/ata/ahci.c | 2 --
drivers/ata/ahci.h | 3 +++
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index d07bf03..ddeb845 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -103,8 +103,6 @@ static struct ata_port_operations ahci_p5wdh_ops = {
.hardreset = ahci_p5wdh_hardreset,
};
-#define AHCI_HFLAGS(flags) .private_data = (void *)(flags)
-
static const struct ata_port_info ahci_port_info[] = {
/* by features */
[board_ahci] =
diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h
index 9c8aed0..7522dd0 100644
--- a/drivers/ata/ahci.h
+++ b/drivers/ata/ahci.h
@@ -195,6 +195,9 @@ enum {
PORT_FBS_EN = (1 << 0), /* Enable FBS */
/* hpriv->flags bits */
+
+#define AHCI_HFLAGS(flags) .private_data = (void *)(flags)
+
AHCI_HFLAG_NO_NCQ = (1 << 0),
AHCI_HFLAG_IGN_IRQ_IF_ERR = (1 << 1), /* ignore IRQ_IF_ERR */
AHCI_HFLAG_IGN_SERR_INTERNAL = (1 << 2), /* ignore SERR_INTERNAL */
next prev parent reply other threads:[~2012-02-20 20:09 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-20 20:09 [PATCH 0/3] ahci: fix boot/resume COMRESET failures Brian Norris
2012-02-20 20:09 ` [PATCH 1/3] ahci: add AHCI_HFLAG_STRICT_SPEC host flag Brian Norris
2012-02-20 20:51 ` Tejun Heo
2012-02-20 21:16 ` Brian Norris
2012-02-20 21:23 ` Tejun Heo
2012-02-20 22:06 ` Brian Norris
2012-02-20 20:09 ` Brian Norris [this message]
2012-02-20 20:09 ` [PATCH 3/3] ahci_platform: add STRICT_AHCI platform type Brian Norris
2012-02-20 20:36 ` [PATCH 0/3] ahci: fix boot/resume COMRESET failures Jeff Garzik
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=1329768563-13715-3-git-send-email-computersforpeace@gmail.com \
--to=computersforpeace@gmail.com \
--cc=cernekee@gmail.com \
--cc=jgarzik@pobox.com \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ming.m.lin@intel.com \
--cc=preining@logic.at \
--cc=rjw@sisk.pl \
--cc=srivatsa.bhat@linux.vnet.ibm.com \
--cc=tj@kernel.org \
--cc=valdis.kletnieks@vt.edu \
/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;
as well as URLs for NNTP newsgroup(s).