From patchwork Wed Mar 25 09:07: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: 46314 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 B1CA92159D for ; Wed, 25 Mar 2015 09:08:31 +0000 (UTC) Received: by wibbs8 with SMTP id bs8sf4045508wib.3 for ; Wed, 25 Mar 2015 02:08:30 -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=xWFDdpv/buhSYg3yFMGloKaZyfVqXMNbK2g1L2OpbpM=; b=TVe6n7WDzET1Tbz7ATbdZN6a6gbuySttvecoRhImo4sU5j3aR5H857+MN53OcxbHWg llu25dHvhpRUfDaiJsAXbcZB3QvtFFhYsTPos2VIvfYCu95ilzAmY25vXypLJiJL9IXF k56iCVSdbQsrGoW7ZwLDZjQcxDgxPnJBbMP57oXnaRe6sbY7aVxrvmCI0Ch7gecz4gYW xXpn21KD+d9Nv1adaYFNxXT1/5NT3f3DHwttmFXoec4T2FX29ETspTQT94t4HTCrlPiy 5MAyw9lPjEkPt2dQGA2ltoohZDdzOHtW7oJAUYz7ZX+HyQo3fbozSv+0bTi5YI0IdnmS 8QXA== X-Gm-Message-State: ALoCoQkIj44GNwhmnLouJbbeNWzZvBPv+4pKXbQRw9g38m+cfNReOaUKMc2SAsac6cuvmMO+gQ+x X-Received: by 10.112.35.135 with SMTP id h7mr1787748lbj.23.1427274510913; Wed, 25 Mar 2015 02:08:30 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.4.38 with SMTP id cb6ls61287lad.97.gmail; Wed, 25 Mar 2015 02:08:30 -0700 (PDT) X-Received: by 10.112.215.101 with SMTP id oh5mr7337190lbc.67.1427274510769; Wed, 25 Mar 2015 02:08:30 -0700 (PDT) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com. [209.85.215.42]) by mx.google.com with ESMTPS id k8si1482097laa.90.2015.03.25.02.08.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Mar 2015 02:08:30 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) client-ip=209.85.215.42; Received: by labe2 with SMTP id e2so14345859lab.3 for ; Wed, 25 Mar 2015 02:08:30 -0700 (PDT) X-Received: by 10.152.43.51 with SMTP id t19mr7387267lal.73.1427274510338; Wed, 25 Mar 2015 02:08:30 -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.57.201 with SMTP id k9csp1959771lbq; Wed, 25 Mar 2015 02:08:29 -0700 (PDT) X-Received: by 10.70.87.195 with SMTP id ba3mr15341314pdb.126.1427274502093; Wed, 25 Mar 2015 02:08:22 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z12si2710047pas.241.2015.03.25.02.08.19; Wed, 25 Mar 2015 02:08:22 -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 S1752101AbbCYJIL (ORCPT + 11 others); Wed, 25 Mar 2015 05:08:11 -0400 Received: from mail-wi0-f169.google.com ([209.85.212.169]:36107 "EHLO mail-wi0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752483AbbCYJH1 (ORCPT ); Wed, 25 Mar 2015 05:07:27 -0400 Received: by wibg7 with SMTP id g7so101275724wib.1 for ; Wed, 25 Mar 2015 02:07:26 -0700 (PDT) X-Received: by 10.180.212.37 with SMTP id nh5mr35343797wic.76.1427274445952; Wed, 25 Mar 2015 02:07:25 -0700 (PDT) Received: from mai.lan (135-224-190-109.dsl.ovh.fr. [109.190.224.135]) by mx.google.com with ESMTPSA id ge8sm2662696wjc.32.2015.03.25.02.07.24 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 25 Mar 2015 02:07:25 -0700 (PDT) From: Daniel Lezcano To: rjw@rjwysocki.net Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org, lina.iyer@linaro.org, Lorenzo.Pieralisi@arm.com Subject: [PATCH 4/8] ARM64: cpuidle: Rename cpu_init_idle to a common function name Date: Wed, 25 Mar 2015 10:07:12 +0100 Message-Id: <1427274436-21916-4-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1427274436-21916-1-git-send-email-daniel.lezcano@linaro.org> References: <55127A53.8050206@linaro.org> <1427274436-21916-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.42 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 Acked-by: Catalin Marinas Tested-by: Lorenzo Pieralisi --- 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;