| From 55d5ec316627b64c3764e4c1b4b8e1988e272c1f Mon Sep 17 00:00:00 2001 |
| From: Brian Norris <computersforpeace@gmail.com> |
| Date: Tue, 21 Feb 2012 10:38:43 -0800 |
| Subject: ahci: move AHCI_HFLAGS() macro to ahci.h |
| |
| From: Brian Norris <computersforpeace@gmail.com> |
| |
| 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> |
| |
| --- |
| drivers/ata/ahci.c | 2 -- |
| drivers/ata/ahci.h | 3 +++ |
| 2 files changed, 3 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/ata/ahci.c |
| +++ b/drivers/ata/ahci.c |
| @@ -103,8 +103,6 @@ static struct ata_port_operations ahci_p |
| .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] = |
| --- 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 */ |
