From patchwork Wed Nov 21 20:34:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bill Pemberton X-Patchwork-Id: 1782241 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id B44663FCAE for ; Wed, 21 Nov 2012 20:35:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756399Ab2KUUfC (ORCPT ); Wed, 21 Nov 2012 15:35:02 -0500 Received: from viridian.itc.Virginia.EDU ([128.143.12.139]:46264 "EHLO viridian.itc.virginia.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756359Ab2KUUfB (ORCPT ); Wed, 21 Nov 2012 15:35:01 -0500 Received: by viridian.itc.virginia.edu (Postfix, from userid 1249) id BC95A80114; Wed, 21 Nov 2012 15:35:00 -0500 (EST) From: Bill Pemberton To: gregkh@linuxfoundation.org Cc: linux-pci@vger.kernel.org, Bjorn Helgaas , Michal Simek , Grant Likely , Rob Herring , microblaze-uclinux@itee.uq.edu.au, devicetree-discuss@lists.ozlabs.org Subject: [PATCH 1/9] microblaze/PCI: Remove CONFIG_HOTPLUG ifdefs Date: Wed, 21 Nov 2012 15:34:52 -0500 Message-Id: <1353530100-728-2-git-send-email-wfp5p@virginia.edu> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1353530100-728-1-git-send-email-wfp5p@virginia.edu> References: <1353530100-728-1-git-send-email-wfp5p@virginia.edu> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Remove conditional code based on CONFIG_HOTPLUG being false. It's always on now in preparation of it going away as an option. Signed-off-by: Bill Pemberton Cc: Bjorn Helgaas Cc: Michal Simek Cc: Grant Likely Cc: Rob Herring Cc: microblaze-uclinux@itee.uq.edu.au Cc: devicetree-discuss@lists.ozlabs.org --- arch/microblaze/pci/pci-common.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c index 4dbb505..a1c5b99 100644 --- a/arch/microblaze/pci/pci-common.c +++ b/arch/microblaze/pci/pci-common.c @@ -1346,8 +1346,6 @@ void __init pcibios_resource_survey(void) pci_assign_unassigned_resources(); } -#ifdef CONFIG_HOTPLUG - /* This is used by the PCI hotplug driver to allocate resource * of newly plugged busses. We can try to consolidate with the * rest of the code later, for now, keep it as-is as our main @@ -1407,8 +1405,6 @@ void pcibios_finish_adding_to_bus(struct pci_bus *bus) } EXPORT_SYMBOL_GPL(pcibios_finish_adding_to_bus); -#endif /* CONFIG_HOTPLUG */ - int pcibios_enable_device(struct pci_dev *dev, int mask) { return pci_enable_resources(dev, mask);