From patchwork Fri Mar 20 11:43:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 46138 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 355B021418 for ; Fri, 20 Mar 2015 11:44:53 +0000 (UTC) Received: by wivr20 with SMTP id r20sf2767495wiv.0 for ; Fri, 20 Mar 2015 04:44:52 -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=kjg2DLtAw9/kX2eN2sKQOGI2lDnhOuyRs5GtKMU7BkBMFntraidE2EHxjiXdRCABXa hmU8JKE1rTCGuQWAoymWIgsksoV9+Y2jnbUKC3KjJdr1Sl/SHAM7gzIW3k+u/c8PSESp 6m5i0zmReAbOvofjmRzZuuHoga1zQvu1vtneQ4fDG5/CvvvKkynzQJLNvfisGeZheiDq mmIZ6z4qwX8tGqFFwXik+O0ViWdspYA5aTJolc3BwqHzyyQsRuZ9f/zwFrLsRp8a1lKT +KZyXKFT+n7dR7oK0YOL4M0TbvAn6UwDrFtLS3JFKRmNzI/2WxRQ1zpAbAVXjq6UsgSR hKbg== X-Gm-Message-State: ALoCoQl42wRiuk87qmcAt3WNZ9h7HoWnUUcaAfN864PuTSfSi2owL9jd0cHehxzJCJAQC16QJ1TR X-Received: by 10.180.75.232 with SMTP id f8mr2675006wiw.0.1426851892444; Fri, 20 Mar 2015 04:44:52 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.181.137 with SMTP id dw9ls375619lac.85.gmail; Fri, 20 Mar 2015 04:44:52 -0700 (PDT) X-Received: by 10.152.178.164 with SMTP id cz4mr71888043lac.39.1426851892090; Fri, 20 Mar 2015 04:44:52 -0700 (PDT) Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com. [209.85.217.169]) by mx.google.com with ESMTPS id le7si1360357lac.36.2015.03.20.04.44.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Mar 2015 04:44:52 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) client-ip=209.85.217.169; Received: by lbblx11 with SMTP id lx11so51158758lbb.3 for ; Fri, 20 Mar 2015 04:44:52 -0700 (PDT) X-Received: by 10.152.28.5 with SMTP id x5mr71512795lag.112.1426851891832; Fri, 20 Mar 2015 04:44:51 -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 h5csp968003lbj; Fri, 20 Mar 2015 04:44:51 -0700 (PDT) X-Received: by 10.70.130.37 with SMTP id ob5mr13123811pdb.54.1426851885481; Fri, 20 Mar 2015 04:44:45 -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.44; Fri, 20 Mar 2015 04:44:45 -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 S1752031AbbCTLoR (ORCPT + 5 others); Fri, 20 Mar 2015 07:44:17 -0400 Received: from mail-we0-f175.google.com ([74.125.82.175]:34049 "EHLO mail-we0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752012AbbCTLoP (ORCPT ); Fri, 20 Mar 2015 07:44:15 -0400 Received: by wegp1 with SMTP id p1so80002549weg.1 for ; Fri, 20 Mar 2015 04:44:14 -0700 (PDT) X-Received: by 10.180.211.144 with SMTP id nc16mr24656282wic.82.1426851854160; Fri, 20 Mar 2015 04:44:14 -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.12 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 Mar 2015 04:44:13 -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 4/8] ARM64: cpuidle: Rename cpu_init_idle to a common function name Date: Fri, 20 Mar 2015 12:43:57 +0100 Message-Id: <1426851841-2072-5-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: 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.217.169 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;