From patchwork Mon Feb 20 20:09:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 142184 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 337E7B6F9D for ; Tue, 21 Feb 2012 07:10:54 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753086Ab2BTUKU (ORCPT ); Mon, 20 Feb 2012 15:10:20 -0500 Received: from mail-pz0-f46.google.com ([209.85.210.46]:33447 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752512Ab2BTUKP (ORCPT ); Mon, 20 Feb 2012 15:10:15 -0500 Received: by mail-pz0-f46.google.com with SMTP id d14so6084812dae.19 for ; Mon, 20 Feb 2012 12:10:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=LRHm7/vYbldOxg+SYPcGTa3su8b91oiOBgoSXy4rcfY=; b=RPvGRipPpx140UucLbGwnMSrI4gADS6J5Ef5o4mHgQ/B2ldb3Bki/94QRYT4PnXc85 A99wmmVSShe967J8+DH4aSmFItlmFvsZee5KBerUX7nSMudyyUdF+AtmdCFcnXzYhs/r WI3LCQiMA982SwGajmddDZULnDzqIz/vAmuJo= Received: by 10.68.225.129 with SMTP id rk1mr32874058pbc.5.1329768615557; Mon, 20 Feb 2012 12:10:15 -0800 (PST) Received: from localhost.localdomain (5520-maca-inet1-outside.broadcom.com. [216.31.211.11]) by mx.google.com with ESMTPS id p2sm25530232pbb.14.2012.02.20.12.10.14 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 20 Feb 2012 12:10:14 -0800 (PST) From: Brian Norris To: Jeff Garzik Cc: , Linux Kernel , Tejun Heo , Kevin Cernekee , Brian Norris , Lin Ming , Norbert Preining , "Srivatsa S . Bhat" , Valdis Kletnieks , "Rafael J . Wysocki" Subject: [PATCH 2/3] ahci: move AHCI_HFLAGS() macro to ahci.h Date: Mon, 20 Feb 2012 12:09:22 -0800 Message-Id: <1329768563-13715-3-git-send-email-computersforpeace@gmail.com> X-Mailer: git-send-email 1.7.5.4.2.g519b1 In-Reply-To: <1329768563-13715-1-git-send-email-computersforpeace@gmail.com> References: <1329768563-13715-1-git-send-email-computersforpeace@gmail.com> Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org 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(-) -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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 9c8aed0..7522dd0 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 */