Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755571Ab2BUSjU (ORCPT ); Tue, 21 Feb 2012 13:39:20 -0500 Received: from mail-pz0-f46.google.com ([209.85.210.46]:44420 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755116Ab2BUSim (ORCPT ); Tue, 21 Feb 2012 13:38:42 -0500 From: Brian Norris To: Jeff Garzik Cc: , Linux Kernel , Tejun Heo , Brian Norris , Lin Ming , Norbert Preining , "Srivatsa S . Bhat" , Valdis Kletnieks , "Rafael J . Wysocki" Subject: [PATCH v2 2/3] ahci: move AHCI_HFLAGS() macro to ahci.h Date: Tue, 21 Feb 2012 10:38:43 -0800 Message-Id: <1329849524-23758-3-git-send-email-computersforpeace@gmail.com> X-Mailer: git-send-email 1.7.5.4.2.g519b1 In-Reply-To: <1329849524-23758-1-git-send-email-computersforpeace@gmail.com> References: <1329849524-23758-1-git-send-email-computersforpeace@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1380 Lines: 41 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 --- drivers/ata/ahci.c | 2 -- drivers/ata/ahci.h | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index d07bf03..ddeb845 100644 --- 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 feb127e..c2594dd 100644 --- 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 */ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/