From patchwork Tue Mar 3 12:29:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 45361 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 14A1A2142B for ; Tue, 3 Mar 2015 12:31:01 +0000 (UTC) Received: by labmn12 with SMTP id mn12sf720675lab.2 for ; Tue, 03 Mar 2015 04:31:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=h+OEDv0RRRso9kH/B752wGEZ1csdLyVXHDvnoeidCg8=; b=PkywJtkDNjZmTnl+aAn1vjkEzfr0a/M/Ope+op3Gkqx9urVlgy9fayEroTpsg+X6bS t8m1l0ma//uAo9+Br/2Lf1Rm+R5SeRB5/5TIW5xfuY+7x2F5N2acXkaqFF5RI9UC8ssz JgwzmLRkknPShhD+Kk8mUyGGHxBmYfI2Oj/ZadKLMPxhCjzO4jUOUPkpoZ16kb71uAMp 8OHwfzv98CF/IECLBqDxn5Arz+j+PbJao5NqoBfn7Kvhr5+W8ZjaPVvokmxLRSYNQEvq PPdcNxYcgzAvpJc1ZqYWXjTfcWzflhf5JjvVEMWkJJCxeH3cXP4pWZbZHl8xHEf4sAPI 0r1g== X-Gm-Message-State: ALoCoQk9vf09tpYcLvazyaDfa8qxi7q8GnJyPxyf0nO14HbveAETNzrfbd21y2Gexm3l4LpIMIGE X-Received: by 10.194.53.225 with SMTP id e1mr2044418wjp.4.1425385859839; Tue, 03 Mar 2015 04:30:59 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.21.33 with SMTP id s1ls32218lae.40.gmail; Tue, 03 Mar 2015 04:30:59 -0800 (PST) X-Received: by 10.112.73.65 with SMTP id j1mr28372580lbv.87.1425385859655; Tue, 03 Mar 2015 04:30:59 -0800 (PST) Received: from mail-lb0-f175.google.com (mail-lb0-f175.google.com. [209.85.217.175]) by mx.google.com with ESMTPS id k7si396878lbd.114.2015.03.03.04.30.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Mar 2015 04:30:59 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.175 as permitted sender) client-ip=209.85.217.175; Received: by lbvp9 with SMTP id p9so13753553lbv.8 for ; Tue, 03 Mar 2015 04:30:59 -0800 (PST) X-Received: by 10.152.43.51 with SMTP id t19mr28355160lal.73.1425385859386; Tue, 03 Mar 2015 04:30:59 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp531182lbj; Tue, 3 Mar 2015 04:30:58 -0800 (PST) X-Received: by 10.68.101.130 with SMTP id fg2mr56270794pbb.118.1425385857659; Tue, 03 Mar 2015 04:30:57 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id yc4si695162pbc.184.2015.03.03.04.30.56; Tue, 03 Mar 2015 04:30:57 -0800 (PST) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756609AbbCCMaw (ORCPT + 28 others); Tue, 3 Mar 2015 07:30:52 -0500 Received: from mail-wi0-f177.google.com ([209.85.212.177]:44433 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756406AbbCCM3w (ORCPT ); Tue, 3 Mar 2015 07:29:52 -0500 Received: by wiwl15 with SMTP id l15so22293255wiw.3 for ; Tue, 03 Mar 2015 04:29:51 -0800 (PST) X-Received: by 10.194.220.7 with SMTP id ps7mr70403081wjc.84.1425385790864; Tue, 03 Mar 2015 04:29:50 -0800 (PST) Received: from mai.lan (135-224-190-109.dsl.ovh.fr. [109.190.224.135]) by mx.google.com with ESMTPSA id h11sm20366995wic.14.2015.03.03.04.29.48 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 03 Mar 2015 04:29:49 -0800 (PST) From: Daniel Lezcano To: lorenzo.pieralisi@arm.com, rjw@rjwysocki.net Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Catalin.Marinas@arm.com, robherring2@gmail.com, arnd@arndb.de, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, lina.iyer@linaro.org Subject: [PATCH 4/6] ARM64: cpuidle: Rename cpu_init_idle to a common function name Date: Tue, 3 Mar 2015 13:29:35 +0100 Message-Id: <1425385777-14766-5-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1425385777-14766-1-git-send-email-daniel.lezcano@linaro.org> References: <1425385777-14766-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: daniel.lezcano@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.175 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , With this change the cpuidle-arm64.c file calls the same function name for both ARM and ARM64. Signed-off-by: Daniel Lezcano --- arch/arm64/include/asm/cpuidle.h | 4 ++-- arch/arm64/kernel/cpuidle.c | 2 +- drivers/cpuidle/cpuidle-arm64.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/cpuidle.h b/arch/arm64/include/asm/cpuidle.h index 1bee287..2bc2732 100644 --- a/arch/arm64/include/asm/cpuidle.h +++ b/arch/arm64/include/asm/cpuidle.h @@ -2,10 +2,10 @@ #define __ASM_CPUIDLE_H #ifdef CONFIG_CPU_IDLE -extern int cpu_init_idle(unsigned int cpu); +extern int arm_cpuidle_init(unsigned int cpu); extern int cpu_suspend(unsigned long arg); #else -static inline int cpu_init_idle(unsigned int cpu) +static inline int arm_cpuidle_init(unsigned int cpu) { return -EOPNOTSUPP; } diff --git a/arch/arm64/kernel/cpuidle.c b/arch/arm64/kernel/cpuidle.c index 5c08966..a78143a 100644 --- a/arch/arm64/kernel/cpuidle.c +++ b/arch/arm64/kernel/cpuidle.c @@ -15,7 +15,7 @@ #include #include -int cpu_init_idle(unsigned int cpu) +int arm_cpuidle_init(unsigned int cpu) { int ret = -EOPNOTSUPP; struct device_node *cpu_node = of_cpu_device_node_get(cpu); diff --git a/drivers/cpuidle/cpuidle-arm64.c b/drivers/cpuidle/cpuidle-arm64.c index 0cea244..6ef291c7 100644 --- a/drivers/cpuidle/cpuidle-arm64.c +++ b/drivers/cpuidle/cpuidle-arm64.c @@ -110,7 +110,7 @@ static int __init arm64_idle_init(void) * idle states suspend back-end specific data */ for_each_possible_cpu(cpu) { - ret = cpu_init_idle(cpu); + ret = arm_cpuidle_init(cpu); if (ret) { pr_err("CPU %d failed to init idle CPU ops\n", cpu); return ret;