From patchwork Wed Mar 25 09:07:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 46312 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7458C2159D for ; Wed, 25 Mar 2015 09:08:23 +0000 (UTC) Received: by wggx13 with SMTP id x13sf3305496wgg.0 for ; Wed, 25 Mar 2015 02:08:22 -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=e6tMn/ZH/z9NHRwQOYOD+shxel9iBBfveDLIARAsphA=; b=RhV8HmBCkNyytjkf2K85tblSx1GIf83Pb/IGTRIlgmT3zHWDQPr5d68hxxYrqNnYtJ FyCnRdK99ebYjlvewoTGgNSYi8kjVIFG4yaT2o8Slejf64vbllhBDwQBgK5rbIQx67i6 VK4pL1SgzUDB0ug4rmZUVEMF1EA3izVR4V3hEQEKk+IcmBIg8We5SM8yMOb9o5brpLoY WKEMHFem7E4eg6acw7t9TAE+HyT4Kh0Dkp/EA5jsuOzKC7vGBATGExH9Ejm5JAtWRTnn t4D51eJ0ady84bNJyA3M3KZ6u5w7ESd4w0ur32cR4/a54WL2w/3U+slbTr/zgc9lNRCA VjHA== X-Gm-Message-State: ALoCoQl9Mip++RVfUkzUkDpq7Rqih55dU1QVcyNuB8Um3xrH7V6TASj/qXhn+80f9VIn5W6XsBbJ X-Received: by 10.112.202.227 with SMTP id kl3mr1850513lbc.2.1427274502439; Wed, 25 Mar 2015 02:08:22 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.206.104 with SMTP id ln8ls64923lac.94.gmail; Wed, 25 Mar 2015 02:08:22 -0700 (PDT) X-Received: by 10.112.73.65 with SMTP id j1mr7395913lbv.87.1427274502289; Wed, 25 Mar 2015 02:08:22 -0700 (PDT) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com. [209.85.217.172]) by mx.google.com with ESMTPS id lb8si1477541lac.108.2015.03.25.02.08.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Mar 2015 02:08:22 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) client-ip=209.85.217.172; Received: by lbbsy1 with SMTP id sy1so12711982lbb.1 for ; Wed, 25 Mar 2015 02:08:22 -0700 (PDT) X-Received: by 10.112.185.66 with SMTP id fa2mr7339137lbc.117.1427274502186; Wed, 25 Mar 2015 02:08:22 -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 k9csp1959699lbq; Wed, 25 Mar 2015 02:08:20 -0700 (PDT) X-Received: by 10.70.135.131 with SMTP id ps3mr15258670pdb.97.1427274496803; Wed, 25 Mar 2015 02:08:16 -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.15; Wed, 25 Mar 2015 02:08:16 -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 S1752500AbbCYJIJ (ORCPT + 11 others); Wed, 25 Mar 2015 05:08:09 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:37596 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752498AbbCYJH3 (ORCPT ); Wed, 25 Mar 2015 05:07:29 -0400 Received: by wixw10 with SMTP id w10so28760017wix.0 for ; Wed, 25 Mar 2015 02:07:28 -0700 (PDT) X-Received: by 10.194.208.229 with SMTP id mh5mr16069034wjc.108.1427274447919; Wed, 25 Mar 2015 02:07:27 -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.26 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 25 Mar 2015 02:07:27 -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 5/8] ARM64: cpuidle: Remove arm64 reference Date: Wed, 25 Mar 2015 10:07:13 +0100 Message-Id: <1427274436-21916-5-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.217.172 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: , In the next patch, this driver will be common across ARM/ARM64. Remove all refs to ARM64 as it will be shared with ARM32. Signed-off-by: Daniel Lezcano Acked-by: Kevin Hilman Acked-by: Rob Herring Acked-by: Lorenzo Pieralisi Tested-by: Lorenzo Pieralisi --- drivers/cpuidle/cpuidle-arm64.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/drivers/cpuidle/cpuidle-arm64.c b/drivers/cpuidle/cpuidle-arm64.c index 6ef291c7..1c94b88 100644 --- a/drivers/cpuidle/cpuidle-arm64.c +++ b/drivers/cpuidle/cpuidle-arm64.c @@ -1,5 +1,5 @@ /* - * ARM64 generic CPU idle driver. + * ARM/ARM64 generic CPU idle driver. * * Copyright (C) 2014 ARM Ltd. * Author: Lorenzo Pieralisi @@ -9,7 +9,7 @@ * published by the Free Software Foundation. */ -#define pr_fmt(fmt) "CPUidle arm64: " fmt +#define pr_fmt(fmt) "CPUidle arm: " fmt #include #include @@ -23,7 +23,7 @@ #include "dt_idle_states.h" /* - * arm64_enter_idle_state - Programs CPU to enter the specified state + * arm_enter_idle_state - Programs CPU to enter the specified state * * dev: cpuidle device * drv: cpuidle driver @@ -32,8 +32,8 @@ * Called from the CPUidle framework to program the device to the * specified target state selected by the governor. */ -static int arm64_enter_idle_state(struct cpuidle_device *dev, - struct cpuidle_driver *drv, int idx) +static int arm_enter_idle_state(struct cpuidle_device *dev, + struct cpuidle_driver *drv, int idx) { int ret; @@ -57,8 +57,8 @@ static int arm64_enter_idle_state(struct cpuidle_device *dev, return ret ? -1 : idx; } -static struct cpuidle_driver arm64_idle_driver = { - .name = "arm64_idle", +static struct cpuidle_driver arm_idle_driver = { + .name = "arm_idle", .owner = THIS_MODULE, /* * State at index 0 is standby wfi and considered standard @@ -68,32 +68,32 @@ static struct cpuidle_driver arm64_idle_driver = { * handler for idle state index 0. */ .states[0] = { - .enter = arm64_enter_idle_state, + .enter = arm_enter_idle_state, .exit_latency = 1, .target_residency = 1, .power_usage = UINT_MAX, .name = "WFI", - .desc = "ARM64 WFI", + .desc = "ARM WFI", } }; -static const struct of_device_id arm64_idle_state_match[] __initconst = { +static const struct of_device_id arm_idle_state_match[] __initconst = { { .compatible = "arm,idle-state", - .data = arm64_enter_idle_state }, + .data = arm_enter_idle_state }, { }, }; /* - * arm64_idle_init + * arm_idle_init * - * Registers the arm64 specific cpuidle driver with the cpuidle + * Registers the arm specific cpuidle driver with the cpuidle * framework. It relies on core code to parse the idle states * and initialize them using driver data structures accordingly. */ -static int __init arm64_idle_init(void) +static int __init arm_idle_init(void) { int cpu, ret; - struct cpuidle_driver *drv = &arm64_idle_driver; + struct cpuidle_driver *drv = &arm_idle_driver; /* * Initialize idle states data, starting at index 1. @@ -101,7 +101,7 @@ static int __init arm64_idle_init(void) * let the driver initialization fail accordingly since there is no * reason to initialize the idle driver if only wfi is supported. */ - ret = dt_init_idle_driver(drv, arm64_idle_state_match, 1); + ret = dt_init_idle_driver(drv, arm_idle_state_match, 1); if (ret <= 0) return ret ? : -ENODEV; @@ -119,4 +119,4 @@ static int __init arm64_idle_init(void) return cpuidle_register(drv, NULL); } -device_initcall(arm64_idle_init); +device_initcall(arm_idle_init);