From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933284Ab2BAWqb (ORCPT ); Wed, 1 Feb 2012 17:46:31 -0500 Received: from acsinet15.oracle.com ([141.146.126.227]:33879 "EHLO acsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754208Ab2BAWon (ORCPT ); Wed, 1 Feb 2012 17:44:43 -0500 From: Yinghai Lu To: Jesse Barnes , Benjamin Herrenschmidt , Tony Luck Cc: Bjorn Helgaas , Dominik Brodowski , Andrew Morton , Linus Torvalds , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Yinghai Lu Subject: [PATCH 13/15] PCI: kill pci_fixup_parent_subordinate_busnr() Date: Wed, 1 Feb 2012 14:44:00 -0800 Message-Id: <1328136242-17725-14-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1328136242-17725-1-git-send-email-yinghai@kernel.org> References: <1328136242-17725-1-git-send-email-yinghai@kernel.org> X-Source-IP: acsinet21.oracle.com [141.146.126.237] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090208.4F29C04F.00C8,ss=1,re=0.000,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now we can safely extend parent top and shrink them according iobusn_resource tree. Don't need that any more. Signed-off-by: Yinghai Lu --- drivers/pci/probe.c | 33 ++------------------------------- 1 files changed, 2 insertions(+), 31 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 97100a9..890e3f9 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -608,22 +608,6 @@ struct pci_bus *__ref pci_add_new_bus(struct pci_bus *parent, struct pci_dev *de return child; } -static void pci_fixup_parent_subordinate_busnr(struct pci_bus *child, int max) -{ - struct pci_bus *parent = child->parent; - - /* Attempts to fix that up are really dangerous unless - we're going to re-assign all bus numbers. */ - if (!pcibios_assign_all_busses()) - return; - - while (parent->parent && parent->subordinate < max) { - parent->subordinate = max; - pci_write_config_byte(parent->self, PCI_SUBORDINATE_BUS, max); - parent = parent->parent; - } -} - static void __devinit pci_bus_extend_top(struct pci_bus *parent, resource_size_t size, struct resource *parent_res) { @@ -970,24 +954,11 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, if (!is_cardbus) { child->bridge_ctl = bctl; - /* - * Adjust subordinate busnr in parent buses. - * We do this before scanning for children because - * some devices may not be detected if the bios - * was lazy. - */ - pci_fixup_parent_subordinate_busnr(child, max); + /* Now we can scan all subordinate buses... */ max = pci_scan_child_bus(child); - /* - * now fix it up again since we have found - * the real value of max. - */ - pci_fixup_parent_subordinate_busnr(child, max); - - } else { - pci_fixup_parent_subordinate_busnr(child, max); } + /* * Set the subordinate bus number to its real value. */ -- 1.7.7