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
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index fb659c8..79a1e9d 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c
@@ -103,8 +103,6 @@ .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 feb127e..c2594dd 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h
@@ -195,6 +195,9 @@ 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 */