From patchwork Mon Jan 27 06:08:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Pitre X-Patchwork-Id: 314313 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id E86192C00E8 for ; Mon, 27 Jan 2014 17:26:49 +1100 (EST) Received: from relais.videotron.ca (relais.videotron.ca [24.201.245.36]) by ozlabs.org (Postfix) with ESMTP id D0AF82C00B0 for ; Mon, 27 Jan 2014 17:24:18 +1100 (EST) Received: from yoda.home ([66.130.143.177]) by VL-VM-MR006.ip.videotron.ca (Oracle Communications Messaging Exchange Server 7u4-22.01 64bit (built Apr 21 2011)) with ESMTP id <0N0100CJZQFBKVJ0@VL-VM-MR006.ip.videotron.ca> for linuxppc-dev@lists.ozlabs.org; Mon, 27 Jan 2014 01:09:11 -0500 (EST) Received: from xanadu.home (xanadu.home [192.168.2.2]) by yoda.home (Postfix) with ESMTP id 4158B2DA069E; Mon, 27 Jan 2014 01:09:11 -0500 (EST) From: Nicolas Pitre To: Russell King , Catalin Marinas , Benjamin Herrenschmidt , Paul Mundt , Thomas Gleixner , Ingo Molnar , Peter Zijlstra , "Rafael J. Wysocki" , Daniel Lezcano Subject: [PATCH 3/9] idle: no more arch_cpu_idle_prepare() users Date: Mon, 27 Jan 2014 01:08:18 -0500 Message-id: <1390802904-28399-4-git-send-email-nicolas.pitre@linaro.org> X-Mailer: git-send-email 1.8.4.108.g55ea5f6 In-reply-to: <1390802904-28399-1-git-send-email-nicolas.pitre@linaro.org> References: <1390802904-28399-1-git-send-email-nicolas.pitre@linaro.org> Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" ... so we can get rid of it entirely. Signed-off-by: Nicolas Pitre Acked-by: Daniel Lezcano --- include/linux/cpu.h | 1 - kernel/cpu/idle.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/include/linux/cpu.h b/include/linux/cpu.h index 03e235ad1b..218fab7521 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h @@ -221,7 +221,6 @@ void cpu_idle(void); void cpu_idle_poll_ctrl(bool enable); void arch_cpu_idle(void); -void arch_cpu_idle_prepare(void); void arch_cpu_idle_enter(void); void arch_cpu_idle_exit(void); void arch_cpu_idle_dead(void); diff --git a/kernel/cpu/idle.c b/kernel/cpu/idle.c index 988573a9a3..4e327e211b 100644 --- a/kernel/cpu/idle.c +++ b/kernel/cpu/idle.c @@ -52,7 +52,6 @@ static inline int cpu_idle_poll(void) } /* Weak implementations for optional arch specific functions */ -void __weak arch_cpu_idle_prepare(void) { } void __weak arch_cpu_idle_enter(void) { } void __weak arch_cpu_idle_exit(void) { } void __weak arch_cpu_idle_dead(void) { } @@ -136,6 +135,5 @@ void cpu_startup_entry(enum cpuhp_state state) boot_init_stack_canary(); #endif __current_set_polling(); - arch_cpu_idle_prepare(); cpu_idle_loop(); }