From patchwork Mon Jul 17 13:29:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 9845031 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3D57560392 for ; Mon, 17 Jul 2017 13:29:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2EA5226E97 for ; Mon, 17 Jul 2017 13:29:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 21D0F274D0; Mon, 17 Jul 2017 13:29:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B521226E97 for ; Mon, 17 Jul 2017 13:29:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751289AbdGQN3w (ORCPT ); Mon, 17 Jul 2017 09:29:52 -0400 Received: from mga11.intel.com ([192.55.52.93]:4278 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751284AbdGQN3v (ORCPT ); Mon, 17 Jul 2017 09:29:51 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Jul 2017 06:29:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,374,1496127600"; d="scan'208";a="112210876" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga002.jf.intel.com with ESMTP; 17 Jul 2017 06:29:48 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 69F22277; Mon, 17 Jul 2017 16:29:47 +0300 (EEST) From: Andy Shevchenko To: "Rafael J . Wysocki" , linux-pm@vger.kernel.org, Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , x86@kernel.org, linux-kernel@vger.kernel.org, Hanjun Guo , linux-acpi@vger.kernel.org Cc: Andy Shevchenko Subject: [PATCH v2 4/5] ACPI / boot: Not all platform require acpi_reduced_hw_init() Date: Mon, 17 Jul 2017 16:29:45 +0300 Message-Id: <20170717132946.20892-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170717132946.20892-1-andriy.shevchenko@linux.intel.com> References: <20170717132946.20892-1-andriy.shevchenko@linux.intel.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Some platform might take care of legacy devices on theirs own. Let's allow them to do that by exporting a weak function. Signed-off-by: Andy Shevchenko --- arch/x86/kernel/acpi/boot.c | 2 +- include/linux/acpi.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 0186d3bae610..71c0feae60a4 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -1348,7 +1348,7 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d) * * We initialize the Hardware-reduced ACPI model here: */ -static void __init acpi_reduced_hw_init(void) +void __init __weak acpi_reduced_hw_init(void) { if (acpi_gbl_reduced_hardware) { /* diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 3848b56fcd83..3ef30a7b5444 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -230,6 +230,8 @@ struct acpi_subtable_proc { void __iomem *__acpi_map_table(unsigned long phys_addr, unsigned long size); void __acpi_unmap_table(void __iomem *map, unsigned long size); + +void acpi_reduced_hw_init(void); int early_acpi_boot_init(void); int acpi_boot_init (void); void acpi_boot_table_init (void); @@ -682,6 +684,7 @@ static inline struct device *acpi_get_first_physical_node(struct acpi_device *ad static inline void acpi_early_init(void) { } static inline void acpi_subsystem_init(void) { } +static inline void acpi_reduced_hw_init(void) { } static inline int early_acpi_boot_init(void) { return 0;