From patchwork Tue Sep 25 08:26:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 186711 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 8A27B2C008E for ; Tue, 25 Sep 2012 18:26:41 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753451Ab2IYI0k (ORCPT ); Tue, 25 Sep 2012 04:26:40 -0400 Received: from rcsinet15.oracle.com ([148.87.113.117]:35433 "EHLO rcsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753469Ab2IYI0h (ORCPT ); Tue, 25 Sep 2012 04:26:37 -0400 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by rcsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id q8P8QXBC030762 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 25 Sep 2012 08:26:34 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id q8P8QXq1016539 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 25 Sep 2012 08:26:33 GMT Received: from abhmt113.oracle.com (abhmt113.oracle.com [141.146.116.65]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id q8P8QXfC002337; Tue, 25 Sep 2012 03:26:33 -0500 Received: from linux-siqj.site (/75.36.245.102) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 25 Sep 2012 01:26:32 -0700 From: Yinghai Lu To: Bjorn Helgaas , Len Brown Cc: linux-pci@vger.kernel.org, Yinghai Lu , linux-acpi@vger.kernel.org Subject: [PATCH 07/29] PCI, ACPI: add acpi_bus_type for host bridge Date: Tue, 25 Sep 2012 01:26:08 -0700 Message-Id: <1348561590-28067-8-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1348561590-28067-1-git-send-email-yinghai@kernel.org> References: <1348561590-28067-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 Instead of abusing of acp_bus_type for pci device and checking device name tricks Signed-off-by: Yinghai Lu Cc: Len Brown Cc: linux-acpi@vger.kernel.org --- drivers/acpi/glue.c | 4 ++-- drivers/pci/pci-acpi.c | 13 +++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c index 243ee85..3079634 100644 --- a/drivers/acpi/glue.c +++ b/drivers/acpi/glue.c @@ -210,8 +210,8 @@ static int acpi_platform_notify(struct device *dev) acpi_handle handle; int ret = -EINVAL; - if (!dev->bus || !dev->parent) { - /* bridge devices genernally haven't bus or parent */ + if (!dev->bus) { + /* bridge devices genernally haven't bus */ ret = acpi_find_bridge_device(dev, &handle); goto end; } diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index c5792d6..a167f6d 100644 --- a/drivers/pci/pci-acpi.c +++ b/drivers/pci/pci-acpi.c @@ -360,7 +360,8 @@ static int acpi_pci_find_device(struct device *dev, acpi_handle *handle) return 0; } -static int acpi_pci_find_root_bridge(struct device *dev, acpi_handle *handle) +static int acpi_pci_host_bridge_find_device(struct device *dev, + acpi_handle *handle) { int num; unsigned int seg, bus; @@ -378,10 +379,14 @@ static int acpi_pci_find_root_bridge(struct device *dev, acpi_handle *handle) return 0; } +static struct acpi_bus_type acpi_pci_host_bridge_bus = { + .bus = &pci_host_bridge_bus_type, + .find_device = acpi_pci_host_bridge_find_device, +}; + static struct acpi_bus_type acpi_pci_bus = { .bus = &pci_bus_type, .find_device = acpi_pci_find_device, - .find_bridge = acpi_pci_find_root_bridge, }; static int __init acpi_pci_init(void) @@ -398,6 +403,10 @@ static int __init acpi_pci_init(void) pcie_no_aspm(); } + ret = register_acpi_bus_type(&acpi_pci_host_bridge_bus); + if (ret) + return 0; + ret = register_acpi_bus_type(&acpi_pci_bus); if (ret) return 0;