ahci: move AHCI_HFLAGS() macro to ahci.h
authorBrian Norris <computersforpeace@gmail.com>
Tue, 21 Feb 2012 18:38:43 +0000 (10:38 -0800)
committerJeff Garzik <jgarzik@redhat.com>
Tue, 13 Mar 2012 20:35:47 +0000 (16:35 -0400)
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>
Cc: stable@kernel.org
drivers/ata/ahci.c
drivers/ata/ahci.h

index fb659c8..79a1e9d 100644 (file)
@@ -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] =
index feb127e..c2594dd 100644 (file)
@@ -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 */