From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932486Ab1JNE2n (ORCPT ); Fri, 14 Oct 2011 00:28:43 -0400 Received: from smtp-out.google.com ([74.125.121.67]:50193 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932432Ab1JNE2j (ORCPT ); Fri, 14 Oct 2011 00:28:39 -0400 DomainKey-Signature: a=rsa-sha1; s=beta; d=google.com; c=nofws; q=dns; h=subject:to:from:cc:date:message-id:in-reply-to:references: user-agent:mime-version:content-type: content-transfer-encoding:x-system-of-record; b=puvgGGk6x3LVRXQCzRguvlVQSUvEqXDPPjgk79N/v5vICSm25mfoBgwqDzHhy2KcK 9biUgqLm7HXmyJcB+4aOA== Subject: [PATCH v2 16/29] ia64/PCI: use pci_create_bus() instead of pci_scan_bus_parented() To: linux-pci@vger.kernel.org From: Bjorn Helgaas Cc: linux-arch@vger.kernel.org, Tony Luck , linux-kernel@vger.kernel.org Date: Thu, 13 Oct 2011 22:28:28 -0600 Message-ID: <20111014042828.23504.61212.stgit@bhelgaas.mtv.corp.google.com> In-Reply-To: <20111014042142.23504.70417.stgit@bhelgaas.mtv.corp.google.com> References: <20111014042142.23504.70417.stgit@bhelgaas.mtv.corp.google.com> User-Agent: StGit/0.15 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-System-Of-Record: true Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This doesn't change any functionality, but it makes a subsequent patch slightly simpler. CC: Tony Luck Signed-off-by: Bjorn Helgaas --- arch/ia64/pci/pci.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index aa2533a..d7e47a9 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c @@ -386,8 +386,11 @@ pci_acpi_scan_root(struct acpi_pci_root *root) * should handle the case here, but it appears that IA64 hasn't * such quirk. So we just ignore the case now. */ - pbus = pci_scan_bus_parented(NULL, bus, &pci_root_ops, controller); + pbus = pci_create_bus(NULL, bus, &pci_root_ops, controller, NULL); + if (!pbus) + return NULL; + pbus->subordinate = pci_scan_child_bus(pbus); return pbus; out3: