From patchwork Tue Mar 3 12:29:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 45359 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0F5EE2142B for ; Tue, 3 Mar 2015 12:30:26 +0000 (UTC) Received: by lbvp9 with SMTP id p9sf1353483lbv.0 for ; Tue, 03 Mar 2015 04:30:24 -0800 (PST) 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=BCLNwOCaduzZaK+Em5JxoZSll5lBfqPB9kR5P0w0yPQ=; b=VMHevPdiMgYM0vzvD5rJpiaAtuCchKzSDX/TqF3qltETkwXsu6iEfUxD75eaRnRi4e 6OTPrHYnGFkI4wX0TROQ+RZqVMGsfskczQRp/7bFxJn0bMn0oza8eyN+AXtoZ4JdLV/s JAk7KUVMlUOOlYR5W+pFM4kDIsU183JgP1IlMgyuU3vVYzz0ppfl0aiCjGGrMRlNb79q KhZn4alWqTglIR7pSYoxo7Ffh6wjNVqJpzfgkEHh6Soc0NH6hhz7z/jpsHDUREC2UBQ7 qXwd2fkJPIOOLqapf8P2KeGRVJ4k/3qgkI1JfsG9lM9uVobKUf5b/j2DEspS1n20OAOV CUzg== X-Gm-Message-State: ALoCoQk2jx0nTZCtyqtV340f9nPobMf2wst68NmeNuWanMPrzZnQpyS+wJwjYNluRc8j1nUavw4X X-Received: by 10.180.89.194 with SMTP id bq2mr218228wib.4.1425385824828; Tue, 03 Mar 2015 04:30:24 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.164.193 with SMTP id ys1ls33195lab.39.gmail; Tue, 03 Mar 2015 04:30:24 -0800 (PST) X-Received: by 10.112.162.42 with SMTP id xx10mr28570725lbb.6.1425385824565; Tue, 03 Mar 2015 04:30:24 -0800 (PST) Received: from mail-la0-f48.google.com (mail-la0-f48.google.com. [209.85.215.48]) by mx.google.com with ESMTPS id r6si440548laa.53.2015.03.03.04.30.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Mar 2015 04:30:24 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) client-ip=209.85.215.48; Received: by labge10 with SMTP id ge10so36950376lab.12 for ; Tue, 03 Mar 2015 04:30:24 -0800 (PST) X-Received: by 10.152.197.34 with SMTP id ir2mr28684962lac.36.1425385824418; Tue, 03 Mar 2015 04:30:24 -0800 (PST) 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 h5csp530856lbj; Tue, 3 Mar 2015 04:30:23 -0800 (PST) X-Received: by 10.68.136.137 with SMTP id qa9mr55359006pbb.127.1425385821105; Tue, 03 Mar 2015 04:30:21 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u12si924589pdj.49.2015.03.03.04.30.20; Tue, 03 Mar 2015 04:30:21 -0800 (PST) Received-SPF: none (google.com: linux-kernel-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 S1756578AbbCCM35 (ORCPT + 28 others); Tue, 3 Mar 2015 07:29:57 -0500 Received: from mail-wi0-f178.google.com ([209.85.212.178]:34639 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756485AbbCCM3y (ORCPT ); Tue, 3 Mar 2015 07:29:54 -0500 Received: by widex7 with SMTP id ex7so21081436wid.1 for ; Tue, 03 Mar 2015 04:29:53 -0800 (PST) X-Received: by 10.194.201.164 with SMTP id kb4mr57045072wjc.32.1425385793621; Tue, 03 Mar 2015 04:29:53 -0800 (PST) Received: from mai.lan (135-224-190-109.dsl.ovh.fr. [109.190.224.135]) by mx.google.com with ESMTPSA id h11sm20366995wic.14.2015.03.03.04.29.51 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 03 Mar 2015 04:29:52 -0800 (PST) From: Daniel Lezcano To: lorenzo.pieralisi@arm.com, rjw@rjwysocki.net 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 5/6] ARM64: cpuidle: Remove arm64 reference Date: Tue, 3 Mar 2015 13:29:36 +0100 Message-Id: <1425385777-14766-6-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1425385777-14766-1-git-send-email-daniel.lezcano@linaro.org> References: <1425385777-14766-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@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.48 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 --- 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);