From patchwork Wed Mar 18 18:46:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 45996 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CAA342153B for ; Wed, 18 Mar 2015 18:47:35 +0000 (UTC) Received: by wghb13 with SMTP id b13sf246942wgh.3 for ; Wed, 18 Mar 2015 11:47:35 -0700 (PDT) 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=4oCJlL7niLjXqL8IjyAQhSEsjkfirldUepRUsTsgU7E=; b=fRaFwyyQm5cnMd/sMKxGQ6jctvHO5NLIrOY+DjEn0+e2784f8LDfAogiHCJNqEdLve IKiuWM25a9KGhCuyGQaBbdyu41XwqAGmllzeTbqkgatpnSbtiHHDTbYS2we3D1oBonRD ZWZ+aax5lto+ZBjdn6hsDDBwH8c4cgGH0CApQI2l2+W6P9uauRNgjafMYgBckDQt1uJJ 3EUJgfJCs7yE4uuZWs3v2oGF0I8A6rrwiXiyLDhoG/9oOjLOMnqO2heF0NdQJhKWMRtS TaduyBj1yRHT1PDEW2NZrMI1c7g4LkfhlNPBUVOXau0dQrefB+XXC6Jl/XX2ndYIO/Ah K2rA== X-Gm-Message-State: ALoCoQk394WkMkV/p1vcFUAFnp2ZXQohqke96Trj2g2ACH6FxFjnNy0VBn6Le6KNh8axd184PWTJ X-Received: by 10.112.40.81 with SMTP id v17mr7385726lbk.5.1426704455139; Wed, 18 Mar 2015 11:47:35 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.88.50 with SMTP id bd18ls216083lab.108.gmail; Wed, 18 Mar 2015 11:47:34 -0700 (PDT) X-Received: by 10.152.8.15 with SMTP id n15mr38317088laa.41.1426704454963; Wed, 18 Mar 2015 11:47:34 -0700 (PDT) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com. [209.85.217.176]) by mx.google.com with ESMTPS id r3si218440lbs.22.2015.03.18.11.47.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Mar 2015 11:47:34 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) client-ip=209.85.217.176; Received: by lbblx11 with SMTP id lx11so14404054lbb.3 for ; Wed, 18 Mar 2015 11:47:34 -0700 (PDT) X-Received: by 10.152.206.70 with SMTP id lm6mr66816200lac.35.1426704454861; Wed, 18 Mar 2015 11:47:34 -0700 (PDT) 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 h5csp1338779lbj; Wed, 18 Mar 2015 11:47:33 -0700 (PDT) X-Received: by 10.66.65.169 with SMTP id y9mr164228538pas.60.1426704452717; Wed, 18 Mar 2015 11:47:32 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id lw6si37687654pdb.189.2015.03.18.11.47.31; Wed, 18 Mar 2015 11:47:32 -0700 (PDT) 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 S932686AbbCRSr1 (ORCPT + 27 others); Wed, 18 Mar 2015 14:47:27 -0400 Received: from mail-wi0-f169.google.com ([209.85.212.169]:33996 "EHLO mail-wi0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756822AbbCRSqe (ORCPT ); Wed, 18 Mar 2015 14:46:34 -0400 Received: by wibg7 with SMTP id g7so68641150wib.1 for ; Wed, 18 Mar 2015 11:46:33 -0700 (PDT) X-Received: by 10.180.19.73 with SMTP id c9mr9737874wie.10.1426704393308; Wed, 18 Mar 2015 11:46:33 -0700 (PDT) Received: from localhost.localdomain (135-224-190-109.dsl.ovh.fr. [109.190.224.135]) by mx.google.com with ESMTPSA id uc18sm4345931wib.0.2015.03.18.11.46.31 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Mar 2015 11:46:32 -0700 (PDT) From: Daniel Lezcano To: rjw@rjwysocki.net, lorenzo.pieralisi@arm.com 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 V2 8/8] ARM: cpuidle: Change function name to be consistent with x86 Date: Wed, 18 Mar 2015 19:46:12 +0100 Message-Id: <1426704372-20406-9-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1426704372-20406-1-git-send-email-daniel.lezcano@linaro.org> References: <1426704372-20406-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.176 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: , Change the functions name: arm_cpuidle_suspend => arm_idle arm_cpuidle_init => arm_idle_cpu_init Signed-off-by: Daniel Lezcano --- arch/arm/include/asm/cpuidle.h | 4 ++-- arch/arm/kernel/cpuidle.c | 4 ++-- arch/arm64/include/asm/cpuidle.h | 6 +++--- arch/arm64/kernel/cpuidle.c | 2 +- drivers/cpuidle/cpuidle-arm.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/include/asm/cpuidle.h b/arch/arm/include/asm/cpuidle.h index 1851e9d..7968948 100644 --- a/arch/arm/include/asm/cpuidle.h +++ b/arch/arm/include/asm/cpuidle.h @@ -42,8 +42,8 @@ struct of_cpuidle_method { __used __section(__cpuidle_method_of_table) \ = { .method = _method, .ops = _ops } -extern int arm_cpuidle_suspend(int index); +extern int arm_idle(int index); -extern int arm_cpuidle_init(int cpu); +extern int arm_idle_cpu_init(int cpu); #endif diff --git a/arch/arm/kernel/cpuidle.c b/arch/arm/kernel/cpuidle.c index 7b42a40..05a2c3e 100644 --- a/arch/arm/kernel/cpuidle.c +++ b/arch/arm/kernel/cpuidle.c @@ -29,7 +29,7 @@ int arm_cpuidle_simple_enter(struct cpuidle_device *dev, return index; } -int arm_cpuidle_suspend(int index) +int arm_idle(int index) { int ret = -EOPNOTSUPP; int cpu = smp_processor_id(); @@ -75,7 +75,7 @@ static int __init arm_cpuidle_read_ops(struct device_node *dn, int cpu) return 0; } -int __init arm_cpuidle_init(int cpu) +int __init arm_idle_cpu_init(int cpu) { int ret = -EOPNOTSUPP; struct device_node *cpu_node = of_cpu_device_node_get(cpu); diff --git a/arch/arm64/include/asm/cpuidle.h b/arch/arm64/include/asm/cpuidle.h index 141b2fc..e9c0dc4e 100644 --- a/arch/arm64/include/asm/cpuidle.h +++ b/arch/arm64/include/asm/cpuidle.h @@ -4,10 +4,10 @@ #include #ifdef CONFIG_CPU_IDLE -extern int arm_cpuidle_init(unsigned int cpu); +extern int arm_idle_cpu_init(unsigned int cpu); extern int cpu_suspend(unsigned long arg); #else -static inline int arm_cpuidle_init(unsigned int cpu) +static inline int arm_idle_cpu_init(unsigned int cpu) { return -EOPNOTSUPP; } @@ -17,7 +17,7 @@ static inline int cpu_suspend(unsigned long arg) return -EOPNOTSUPP; } #endif -static inline int arm_cpuidle_suspend(int index) +static inline int arm_idle(int index) { return cpu_suspend(index); } diff --git a/arch/arm64/kernel/cpuidle.c b/arch/arm64/kernel/cpuidle.c index a78143a..b6b4fcf 100644 --- a/arch/arm64/kernel/cpuidle.c +++ b/arch/arm64/kernel/cpuidle.c @@ -15,7 +15,7 @@ #include #include -int arm_cpuidle_init(unsigned int cpu) +int arm_idle_cpu_init(unsigned int cpu) { int ret = -EOPNOTSUPP; struct device_node *cpu_node = of_cpu_device_node_get(cpu); diff --git a/drivers/cpuidle/cpuidle-arm.c b/drivers/cpuidle/cpuidle-arm.c index 0682ed0..cd8c32f 100644 --- a/drivers/cpuidle/cpuidle-arm.c +++ b/drivers/cpuidle/cpuidle-arm.c @@ -52,7 +52,7 @@ static int arm_enter_idle_state(struct cpuidle_device *dev, * call the CPU ops suspend protocol with idle index as a * parameter. */ - arm_cpuidle_suspend(idx); + arm_idle(idx); cpu_pm_exit(); } @@ -120,7 +120,7 @@ static int __init arm_idle_init(void) * idle states suspend back-end specific data */ for_each_possible_cpu(cpu) { - ret = arm_cpuidle_init(cpu); + ret = arm_idle_cpu_init(cpu); /* This cpu does not support any idle states */ if (ret == -ENOSYS)