From patchwork Wed Mar 18 18:46:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 45998 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f200.google.com (mail-we0-f200.google.com [74.125.82.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 07C082153B for ; Wed, 18 Mar 2015 18:48:16 +0000 (UTC) Received: by wesk11 with SMTP id k11sf4151680wes.3 for ; Wed, 18 Mar 2015 11:48:15 -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=76QCZh9XNGemGPiCauttTSHQhvhlIxM6iJN9BdhkdGY=; b=Rv+d1c/eqKwm0gsvyqY8eYr2bXcgIy6+jWaFBs4QBb4rJVPuz3iV6vbQNJTtTjUwwo kSsM+Om6L66t7A+dcrM+XERJQXHL2FpWaGY2SY+GKZSN/+TBMYBR1a8XHLw6xGDNGtAU pElkQSJoiAJtvyU2b1fUtbpcv1gL9gzSiSNpMrU4MUgsSH7R3f/lhfZ4vBWlfmkwaoTX YFeNVxuMage2YH31uj6PKHPLULYy/U41Yb1lcWs9uufal5SkZXTkVXwq2o6tSjyHBZOn 9T6tU+HP/rCaBv9/7d5z5NL9oAmz3W55bm3eWYQfWlGGDX8wZQPE0IMmjh+5BmPehA3C 6e4w== X-Gm-Message-State: ALoCoQkFfbTK7CooK/0dKBrmRY6OtK2walm8aMlmj8jM6fFAVfzPx4J2NyC4tkNTBS5OVuEMasfO X-Received: by 10.194.178.67 with SMTP id cw3mr7039561wjc.2.1426704495293; Wed, 18 Mar 2015 11:48:15 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.205.33 with SMTP id ld1ls180041lac.16.gmail; Wed, 18 Mar 2015 11:48:15 -0700 (PDT) X-Received: by 10.112.130.39 with SMTP id ob7mr67544483lbb.32.1426704494990; Wed, 18 Mar 2015 11:48:14 -0700 (PDT) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com. [209.85.215.50]) by mx.google.com with ESMTPS id db4si13526402lac.79.2015.03.18.11.48.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Mar 2015 11:48:14 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) client-ip=209.85.215.50; Received: by labjg1 with SMTP id jg1so43792861lab.2 for ; Wed, 18 Mar 2015 11:48:14 -0700 (PDT) X-Received: by 10.112.25.38 with SMTP id z6mr15069070lbf.106.1426704494708; Wed, 18 Mar 2015 11:48:14 -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 h5csp1339107lbj; Wed, 18 Mar 2015 11:48:14 -0700 (PDT) X-Received: by 10.70.48.37 with SMTP id i5mr59062275pdn.111.1426704493124; Wed, 18 Mar 2015 11:48:13 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k6si6228803pdm.248.2015.03.18.11.48.12; Wed, 18 Mar 2015 11:48:13 -0700 (PDT) Received-SPF: none (google.com: devicetree-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 S932730AbbCRSsK (ORCPT + 5 others); Wed, 18 Mar 2015 14:48:10 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:33388 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756746AbbCRSq0 (ORCPT ); Wed, 18 Mar 2015 14:46:26 -0400 Received: by wixw10 with SMTP id w10so68624980wix.0 for ; Wed, 18 Mar 2015 11:46:24 -0700 (PDT) X-Received: by 10.194.59.112 with SMTP id y16mr148855997wjq.36.1426704384810; Wed, 18 Mar 2015 11:46:24 -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.22 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Mar 2015 11:46:24 -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 4/8] ARM64: cpuidle: Rename cpu_init_idle to a common function name Date: Wed, 18 Mar 2015 19:46:08 +0100 Message-Id: <1426704372-20406-5-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: devicetree-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: devicetree@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.50 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 Acked-by: Kevin Hilman Acked-by: Rob Herring --- 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 460a38b..141b2fc 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 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;