From patchwork Fri Apr 12 22:44:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 236262 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 8AA4A2C00A7 for ; Sat, 13 Apr 2013 08:48:40 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756248Ab3DLWqb (ORCPT ); Fri, 12 Apr 2013 18:46:31 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:47030 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755522Ab3DLWq1 (ORCPT ); Fri, 12 Apr 2013 18:46:27 -0400 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by aserp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id r3CMikHZ003801 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 12 Apr 2013 22:44:47 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r3CMikOs018417 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 12 Apr 2013 22:44:46 GMT Received: from abhmt115.oracle.com (abhmt115.oracle.com [141.146.116.67]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id r3CMijvS003689; Fri, 12 Apr 2013 17:44:45 -0500 Received: from linux-siqj.site (/10.132.126.191) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 12 Apr 2013 15:44:45 -0700 From: Yinghai Lu To: Bjorn Helgaas , Ram Pai Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Yinghai Lu Subject: [PATCH v4 03/29] PCI: Update pci_resource_start etc to use pci_dev_resource_n() Date: Fri, 12 Apr 2013 15:44:17 -0700 Message-Id: <1365806683-26717-4-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1365806683-26717-1-git-send-email-yinghai@kernel.org> References: <1365806683-26717-1-git-send-email-yinghai@kernel.org> X-Source-IP: acsinet21.oracle.com [141.146.126.237] Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Now pci_resource_start is using dev->resource[n] directly. Replace it with pci_dev_resource[n] to prepare for addon resource support. -v2: fix warning about const pointer that Fengguang found. Signed-off-by: Yinghai Lu --- include/linux/pci.h | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/include/linux/pci.h b/include/linux/pci.h index ffff013..6d450d2 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1455,16 +1455,31 @@ static inline struct pci_dev *pci_dev_get(struct pci_dev *dev) /* these helpers provide future and backwards compatibility * for accessing popular PCI BAR info */ -#define pci_resource_start(dev, bar) ((dev)->resource[(bar)].start) -#define pci_resource_end(dev, bar) ((dev)->resource[(bar)].end) -#define pci_resource_flags(dev, bar) ((dev)->resource[(bar)].flags) -#define pci_resource_len(dev,bar) \ - ((pci_resource_start((dev), (bar)) == 0 && \ - pci_resource_end((dev), (bar)) == \ - pci_resource_start((dev), (bar))) ? 0 : \ - \ - (pci_resource_end((dev), (bar)) - \ - pci_resource_start((dev), (bar)) + 1)) +static inline resource_size_t pci_resource_start(const struct pci_dev *dev, + int bar) +{ + return pci_dev_resource_n((struct pci_dev *)dev, bar)->start; +} +static inline resource_size_t pci_resource_end(const struct pci_dev *dev, + int bar) +{ + return pci_dev_resource_n((struct pci_dev *)dev, bar)->end; +} +static inline unsigned long pci_resource_flags(const struct pci_dev *dev, + int bar) +{ + return pci_dev_resource_n((struct pci_dev *)dev, bar)->flags; +} +static inline resource_size_t pci_resource_len(const struct pci_dev *dev, + int bar) +{ + struct resource *res = pci_dev_resource_n((struct pci_dev *)dev, bar); + + if (res->start == 0 && res->end == res->start) + return 0; + + return res->end - res->start + 1; +} /* Similar to the helpers above, these manipulate per-pci_dev * driver-specific data. They are really just a wrapper around