From patchwork Mon Feb 11 23:01:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shuah Khan X-Patchwork-Id: 219696 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 838072C02FC for ; Tue, 12 Feb 2013 10:01:23 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760025Ab3BKXBV (ORCPT ); Mon, 11 Feb 2013 18:01:21 -0500 Received: from g1t0027.austin.hp.com ([15.216.28.34]:22936 "EHLO g1t0027.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760009Ab3BKXBV (ORCPT ); Mon, 11 Feb 2013 18:01:21 -0500 Received: from g1t0038.austin.hp.com (g1t0038.austin.hp.com [16.236.32.44]) by g1t0027.austin.hp.com (Postfix) with ESMTP id 341FE3813F; Mon, 11 Feb 2013 23:01:14 +0000 (UTC) Received: from [10.152.1.34] (swa01cs003-da01.atlanta.hp.com [16.114.29.153]) by g1t0038.austin.hp.com (Postfix) with ESMTP id 8F6AC30045; Mon, 11 Feb 2013 23:01:11 +0000 (UTC) Message-ID: <1360623670.2950.67.camel@lorien2> Subject: [PATCH 3/4] amd_iommu: Remove local PCI_BUS() define and use PCI_BUS() from pci From: Shuah Khan Reply-To: shuah.khan@hp.com To: bhelgaas@google.com, Joerg Roedel Cc: tglx@linutronix.de, mtk.manpages@gmail.com, iommu@lists.linux-foundation.org, LKML , linux-pci@vger.kernel.org, shemminger@vyatta.com, jiang.liu@huawei.com, linasvepstas@gmail.com, paulmck@linux.vnet.ibm.com, davej@redhat.com, dhowells@redhat.com, wangyijing@huawei.com, shuahkhan@gmail.com Date: Mon, 11 Feb 2013 16:01:10 -0700 Organization: ISS-Linux X-Mailer: Evolution 3.2.3-0ubuntu6 Mime-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Change to remove local PCI_BUS() define and use the new PCI_BUS interface from pci. Signed-off-by: Shuah Khan --- drivers/iommu/amd_iommu_types.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/iommu/amd_iommu_types.h b/drivers/iommu/amd_iommu_types.h index e38ab43..a07882f 100644 --- a/drivers/iommu/amd_iommu_types.h +++ b/drivers/iommu/amd_iommu_types.h @@ -24,6 +24,7 @@ #include #include #include +#include /* * Maximum number of IOMMUs supported @@ -315,9 +316,6 @@ #define MAX_DOMAIN_ID 65536 -/* FIXME: move this macro to */ -#define PCI_BUS(x) (((x) >> 8) & 0xff) - /* Protection domain flags */ #define PD_DMA_OPS_MASK (1UL << 0) /* domain used for dma_ops */ #define PD_DEFAULT_MASK (1UL << 1) /* domain is a default dma_ops