From patchwork Wed Jul 22 21:39:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wdavis@nvidia.com X-Patchwork-Id: 6846971 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B55339F38C for ; Wed, 22 Jul 2015 21:54:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D81132064C for ; Wed, 22 Jul 2015 21:54:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EBEFB20651 for ; Wed, 22 Jul 2015 21:54:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753500AbbGVVyI (ORCPT ); Wed, 22 Jul 2015 17:54:08 -0400 Received: from hqemgate14.nvidia.com ([216.228.121.143]:13566 "EHLO hqemgate14.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753222AbbGVVyG (ORCPT ); Wed, 22 Jul 2015 17:54:06 -0400 Received: from hqnvupgp08.nvidia.com (Not Verified[216.228.121.13]) by hqemgate14.nvidia.com id ; Wed, 22 Jul 2015 14:53:57 -0700 Received: from HQMAIL107.nvidia.com ([172.20.187.13]) by hqnvupgp08.nvidia.com (PGP Universal service); Wed, 22 Jul 2015 14:54:05 -0700 X-PGP-Universal: processed; by hqnvupgp08.nvidia.com on Wed, 22 Jul 2015 14:54:05 -0700 Received: from HQMAIL102.nvidia.com (172.18.146.10) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1044.25; Wed, 22 Jul 2015 21:54:05 +0000 Received: from HQMAIL107.nvidia.com (172.20.187.13) by HQMAIL102.nvidia.com (172.18.146.10) with Microsoft SMTP Server (TLS) id 15.0.1044.25; Wed, 22 Jul 2015 21:54:05 +0000 Received: from hqnvemgw01.nvidia.com (172.20.150.20) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server id 15.0.1044.25 via Frontend Transport; Wed, 22 Jul 2015 21:54:05 +0000 Received: from wdavis-lt.nvidia.com (Not Verified[10.20.168.59]) by hqnvemgw01.nvidia.com with MailMarshal (v7, 1, 2, 5326) id ; Wed, 22 Jul 2015 14:54:04 -0700 From: Will Davis To: Bjorn Helgaas , Alex Williamson , Joerg Roedel CC: , , "Konrad Wilk" , Mark Hounschell , "David S. Miller" , Jonathan Corbet , "Terence Ripperda" , John Hubbard , "Jerome Glisse" Subject: [PATCH v4 07/12] pci: expose pci_find_host_bridge() Date: Wed, 22 Jul 2015 16:39:52 -0500 Message-ID: <1437601197-6481-8-git-send-email-wdavis@nvidia.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1437601197-6481-1-git-send-email-wdavis@nvidia.com> References: <1437601197-6481-1-git-send-email-wdavis@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This function takes a struct pci_bus * and returns the associated struct pci_host_bridge * upstream. Signed-off-by: Will Davis --- drivers/pci/host-bridge.c | 19 ++----------------- include/linux/pci.h | 7 +++++++ 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/drivers/pci/host-bridge.c b/drivers/pci/host-bridge.c index 5f4a2e0..6c2c82a 100644 --- a/drivers/pci/host-bridge.c +++ b/drivers/pci/host-bridge.c @@ -8,25 +8,10 @@ #include "pci.h" -static struct pci_bus *find_pci_root_bus(struct pci_bus *bus) -{ - while (bus->parent) - bus = bus->parent; - - return bus; -} - -struct pci_host_bridge *pci_find_host_bridge(struct pci_bus *bus) -{ - struct pci_bus *root_bus = find_pci_root_bus(bus); - - return to_pci_host_bridge(root_bus->bridge); -} - struct device *pci_get_host_bridge_device(struct pci_dev *dev) { - struct pci_bus *root_bus = find_pci_root_bus(dev->bus); - struct device *bridge = root_bus->bridge; + struct pci_host_bridge *host_bridge = pci_find_host_bridge(dev->bus); + struct device *bridge = &host_bridge->dev; kobject_get(&bridge->kobj); return bridge; diff --git a/include/linux/pci.h b/include/linux/pci.h index 8a0321a..d58063e 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -512,6 +512,13 @@ static inline struct pci_dev *pci_upstream_bridge(struct pci_dev *dev) return dev->bus->self; } +static inline struct pci_host_bridge *pci_find_host_bridge(struct pci_bus *bus) +{ + while (bus->parent) + bus = bus->parent; + return to_pci_host_bridge(bus->bridge); +} + struct device *pci_get_host_bridge_device(struct pci_dev *dev); void pci_put_host_bridge_device(struct device *dev);