ahci: move AHCI_HFLAGS() macro to ahci.h

commit 55d5ec316627b64c3764e4c1b4b8e1988e272c1f upstream.

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>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index d07bf0366d99ee06cc3d4b3df62d617e5ef7cc15..ddeb845099e4c4363907553e310b816f4a5ed17b 100644 (file)
--- 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 feb127ef4e4ec3c09f8de75bb5ee171ba7ff6a5b..c2594ddf25b00f54d22b51c66f23db5d54d47222 100644 (file)
--- 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 */