From patchwork Fri Mar 20 11:44:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 46141 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9FCE021418 for ; Fri, 20 Mar 2015 11:45:14 +0000 (UTC) Received: by wivr20 with SMTP id r20sf2769105wiv.0 for ; Fri, 20 Mar 2015 04:45:14 -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=5f1ZpbHJHlBbuubbMnR73UTmZRGm6yV5nhnCzZ8BECQ=; b=XgEWBcy81D0Lzb4DP7Zf5eRNTsA0aUr8/hKyX7Vope8t1TtYXr+4i53n7m9spp3umA qpyu/zR4Qe9e450eYbb5nVA6drKUpAViqBdP06PBd7ARPOtUhD7Ptw6VTD+K8JDZixHz P7hMXeyBy1yijeDjV2OtQtiL81CREQKyejbBH5jHCGWpl7ozqUZJBKxePVaYnTZed7L8 5qKdmvz5ObeGq33bQWBmZma5ADyUeLdEuFILZZi53Ndekskp2B4oUPbQqJtVOA2tsQsd 1BA9D8G4Vj7iFRT6f44WUfdLYgXd5O3/Xxy0qGJwRHjJSRX8mTK6+1b5DSlN3//KqCYF Wb6A== X-Gm-Message-State: ALoCoQmMuBSEWfUA0nRYLQKU7cgRK4ykIi73NzaJKee9aMmdl8AzzO1SmblXRFrIQ8kELUPSIxON X-Received: by 10.194.161.194 with SMTP id xu2mr12995744wjb.1.1426851913987; Fri, 20 Mar 2015 04:45:13 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.3.10 with SMTP id 10ls376826lay.26.gmail; Fri, 20 Mar 2015 04:45:13 -0700 (PDT) X-Received: by 10.112.188.227 with SMTP id gd3mr54008182lbc.0.1426851913694; Fri, 20 Mar 2015 04:45:13 -0700 (PDT) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id h1si3001732lae.136.2015.03.20.04.45.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Mar 2015 04:45:13 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by labjg1 with SMTP id jg1so84885460lab.2 for ; Fri, 20 Mar 2015 04:45:13 -0700 (PDT) X-Received: by 10.112.201.231 with SMTP id kd7mr52787190lbc.35.1426851913381; Fri, 20 Mar 2015 04:45:13 -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 h5csp968177lbj; Fri, 20 Mar 2015 04:45:12 -0700 (PDT) X-Received: by 10.70.46.41 with SMTP id s9mr41520846pdm.37.1426851895790; Fri, 20 Mar 2015 04:44:55 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ry1si8717553pab.199.2015.03.20.04.44.54; Fri, 20 Mar 2015 04:44:55 -0700 (PDT) Received-SPF: none (google.com: linux-pm-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 S1751037AbbCTLow (ORCPT + 11 others); Fri, 20 Mar 2015 07:44:52 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:38401 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752070AbbCTLoY (ORCPT ); Fri, 20 Mar 2015 07:44:24 -0400 Received: by wibgn9 with SMTP id gn9so11653374wib.1 for ; Fri, 20 Mar 2015 04:44:22 -0700 (PDT) X-Received: by 10.194.63.16 with SMTP id c16mr163217001wjs.117.1426851862867; Fri, 20 Mar 2015 04:44:22 -0700 (PDT) Received: from mai.lan (135-224-190-109.dsl.ovh.fr. [109.190.224.135]) by mx.google.com with ESMTPSA id m4sm6007225wjb.25.2015.03.20.04.44.20 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 Mar 2015 04:44:22 -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, sboyd@codeaurora.org Subject: [PATCH V3 8/8] ARM: cpuidle: Change function name to be consistent with x86 Date: Fri, 20 Mar 2015 12:44:01 +0100 Message-Id: <1426851841-2072-9-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1426851841-2072-1-git-send-email-daniel.lezcano@linaro.org> References: <1426851841-2072-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-pm@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.215.44 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 0f84249..5f547c0 100644 --- a/arch/arm/include/asm/cpuidle.h +++ b/arch/arm/include/asm/cpuidle.h @@ -44,8 +44,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 e4a6eba..37c732d 100644 --- a/drivers/cpuidle/cpuidle-arm.c +++ b/drivers/cpuidle/cpuidle-arm.c @@ -50,7 +50,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(); } @@ -118,7 +118,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 == -ENXIO)