From patchwork Thu Sep 20 07:43:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 1483131 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 88028DF2D2 for ; Thu, 20 Sep 2012 07:46:41 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TEbQs-00072D-A9; Thu, 20 Sep 2012 07:44:22 +0000 Received: from moutng.kundenserver.de ([212.227.126.186]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TEbQP-0006wP-Sn for linux-arm-kernel@lists.infradead.org; Thu, 20 Sep 2012 07:43:55 +0000 Received: from mailbox.adnet.avionic-design.de (mailbox.avionic-design.de [109.75.18.3]) by mrelayeu.kundenserver.de (node=mreu4) with ESMTP (Nemesis) id 0MhJnJ-1SspJH1R3p-00MFRr; Thu, 20 Sep 2012 09:43:51 +0200 Received: from localhost (localhost [127.0.0.1]) by mailbox.adnet.avionic-design.de (Postfix) with ESMTP id ACEC92A28301; Thu, 20 Sep 2012 09:43:49 +0200 (CEST) X-Virus-Scanned: amavisd-new at avionic-design.de Received: from mailbox.adnet.avionic-design.de ([127.0.0.1]) by localhost (mailbox.avionic-design.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id g1R14yBPbK6d; Thu, 20 Sep 2012 09:43:48 +0200 (CEST) Received: from localhost (avionic-0098.adnet.avionic-design.de [172.20.31.233]) (Authenticated sender: thierry.reding) by mailbox.adnet.avionic-design.de (Postfix) with ESMTPA id 42CFD2A28183; Thu, 20 Sep 2012 09:43:48 +0200 (CEST) From: Thierry Reding To: Russell King Subject: [PATCH v3 1/2] ARM: pci: Keep pci_common_init() around after init Date: Thu, 20 Sep 2012 09:43:44 +0200 Message-Id: <1348127025-29461-2-git-send-email-thierry.reding@avionic-design.de> X-Mailer: git-send-email 1.7.12 In-Reply-To: <1348127025-29461-1-git-send-email-thierry.reding@avionic-design.de> References: <1348127025-29461-1-git-send-email-thierry.reding@avionic-design.de> X-Provags-ID: V02:K0:BbqeNjT2yG8C6pf3QOO+Zwp3pG8KlnYkbuQG2LgEFxx qSWxknbZ9WOU49QLjQi0urE8agXEGKhqxMdf64s0Vh3IkeoeY5 LtO6i+lXDXrdNc+3vllYGHPe5J7YXkMf0qwDUUUOjS0FkfoSOZ shX1vlZzduYA6MeeNbE2LPVJJa76wC/gTOcpxpVb714b4psTsO EGAb7rBhJCq8p91bW13SJeiqcpBT0f63n7ib82UhFTJgZ9eWN9 pMVp414FcFeZxW0A0+trKdlVZ7S78hgBmvKcZm5b31vkzRoldG 18S38BFvlLbTI4R0yfoENVXQJBCV/ABgW/7xv1oXIOGuq1b8Gt IqXt0jtHwwjnRF+PfsFnpspDY/RaHetrQrzWib1ObkCH0QHjKg gk/h6B3/oR34R27luw0KxH961qVVNrrjbq/VJCtGXqk7EpJtVf xQH/S X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.186 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Bjorn Helgaas , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org When using deferred driver probing, PCI host controller drivers may actually require this function after the init stage. Signed-off-by: Thierry Reding --- Changes in v3: - remove __init annotation from pcibios_init_resources() Changes in v2: - remove __devinit annotation from pcibios_swizzle - remove __init annotations altogether arch/arm/kernel/bios32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index b244696..2c80f36 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c @@ -389,7 +389,7 @@ EXPORT_SYMBOL(pcibios_fixup_bus); * PCI standard swizzle is implemented on plug-in cards and Cardbus based * PCI extenders, so it can not be ignored. */ -static u8 __devinit pcibios_swizzle(struct pci_dev *dev, u8 *pin) +static u8 pcibios_swizzle(struct pci_dev *dev, u8 *pin) { struct pci_sys_data *sys = dev->sysdata; int slot, oldpin = *pin; @@ -424,7 +424,7 @@ static int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) return irq; } -static int __init pcibios_init_resources(int busnr, struct pci_sys_data *sys) +static int pcibios_init_resources(int busnr, struct pci_sys_data *sys) { int ret; struct pci_host_bridge_window *window; @@ -456,7 +456,7 @@ static int __init pcibios_init_resources(int busnr, struct pci_sys_data *sys) return 0; } -static void __init pcibios_init_hw(struct hw_pci *hw, struct list_head *head) +static void pcibios_init_hw(struct hw_pci *hw, struct list_head *head) { struct pci_sys_data *sys = NULL; int ret; @@ -504,7 +504,7 @@ static void __init pcibios_init_hw(struct hw_pci *hw, struct list_head *head) } } -void __init pci_common_init(struct hw_pci *hw) +void pci_common_init(struct hw_pci *hw) { struct pci_sys_data *sys; LIST_HEAD(head);