From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754177AbcHZPip (ORCPT ); Fri, 26 Aug 2016 11:38:45 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:62668 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754150AbcHZPin (ORCPT ); Fri, 26 Aug 2016 11:38:43 -0400 From: Paul Burton To: , Ralf Baechle CC: Paul Burton , Lorenzo Pieralisi , Bjorn Helgaas , , Sergey Ryazanov Subject: [PATCH 02/26] MIPS: PCI: Make pcibios_set_cache_line_size an initcall Date: Fri, 26 Aug 2016 16:37:01 +0100 Message-ID: <20160826153725.11629-3-paul.burton@imgtec.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160826153725.11629-1-paul.burton@imgtec.com> References: <20160826153725.11629-1-paul.burton@imgtec.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.100.200.141] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In preparation for allowing configurations in which pcibios_init is not included, make pcibios_set_cache_line_size an initcall. arch_initcall is used such that it runs before the pcibios_init subsys_initcall for platforms that continue to use it. Signed-off-by: Paul Burton --- arch/mips/pci/pci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c index 5207c04..30320a4 100644 --- a/arch/mips/pci/pci.c +++ b/arch/mips/pci/pci.c @@ -220,7 +220,7 @@ out: "Skipping PCI bus scan due to resource conflict\n"); } -static void __init pcibios_set_cache_line_size(void) +static int __init pcibios_set_cache_line_size(void) { struct cpuinfo_mips *c = ¤t_cpu_data; unsigned int lsize; @@ -238,14 +238,14 @@ static void __init pcibios_set_cache_line_size(void) pci_dfl_cache_line_size = lsize >> 2; pr_debug("PCI: pci_cache_line_size set to %d bytes\n", lsize); + return 0; } +arch_initcall(pcibios_set_cache_line_size); static int __init pcibios_init(void) { struct pci_controller *hose; - pcibios_set_cache_line_size(); - /* Scan all of the recorded PCI controllers. */ list_for_each_entry(hose, &controllers, list) pcibios_scanbus(hose); -- 2.9.3