aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2012-02-21 13:38:43 -0500
committerJeff Garzik <jgarzik@redhat.com>2012-03-13 16:35:47 -0400
commit55d5ec316627b64c3764e4c1b4b8e1988e272c1f (patch)
tree02143de94a97d4c56c94d30acf7f544ec233ed15 /drivers/ata
parent66583c9fa63d05d5580e409f9a58d3cad6d76d17 (diff)
ahci: move AHCI_HFLAGS() macro to ahci.h
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
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/ahci.c2
-rw-r--r--drivers/ata/ahci.h3
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index fb659c844506..79a1e9dd56d9 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -103,8 +103,6 @@ static struct ata_port_operations ahci_p5wdh_ops = {
103 .hardreset = ahci_p5wdh_hardreset, 103 .hardreset = ahci_p5wdh_hardreset,
104}; 104};
105 105
106#define AHCI_HFLAGS(flags) .private_data = (void *)(flags)
107
108static const struct ata_port_info ahci_port_info[] = { 106static const struct ata_port_info ahci_port_info[] = {
109 /* by features */ 107 /* by features */
110 [board_ahci] = 108 [board_ahci] =
diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h
index feb127ef4e4e..c2594ddf25b0 100644
--- a/drivers/ata/ahci.h
+++ b/drivers/ata/ahci.h
@@ -195,6 +195,9 @@ enum {
195 PORT_FBS_EN = (1 << 0), /* Enable FBS */ 195 PORT_FBS_EN = (1 << 0), /* Enable FBS */
196 196
197 /* hpriv->flags bits */ 197 /* hpriv->flags bits */
198
199#define AHCI_HFLAGS(flags) .private_data = (void *)(flags)
200
198 AHCI_HFLAG_NO_NCQ = (1 << 0), 201 AHCI_HFLAG_NO_NCQ = (1 << 0),
199 AHCI_HFLAG_IGN_IRQ_IF_ERR = (1 << 1), /* ignore IRQ_IF_ERR */ 202 AHCI_HFLAG_IGN_IRQ_IF_ERR = (1 << 1), /* ignore IRQ_IF_ERR */
200 AHCI_HFLAG_IGN_SERR_INTERNAL = (1 << 2), /* ignore SERR_INTERNAL */ 203 AHCI_HFLAG_IGN_SERR_INTERNAL = (1 << 2), /* ignore SERR_INTERNAL */