From patchwork Wed Mar 18 18:46:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 45994 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 E53D72153B for ; Wed, 18 Mar 2015 18:46:55 +0000 (UTC) Received: by widex7 with SMTP id ex7sf9290850wid.2 for ; Wed, 18 Mar 2015 11:46:55 -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=6QAIU6mOfrr5U6958t5uczVJbPlGJ0NjXET9/fagdy8=; b=JnPpu+xj5sIsPXzp+v4VrennZa+5ztvbqzXJHqtMD+hLFon9JKsXF8w5c00gPuhjCK +80hSHd3NdugDAdBFvFWlMtkSpoVxgmfvdxf+orjjRVEbN0nZYMhF5lQHdjqIwreMYGT hOhcHTdvzqErrurYjdEIpIi58GPfs/Yq75YKMSI7+ZteiJaoRdFwNnmO4zMjUSfOH6Dg sSiFUk7J5gqcRJ3FSYxG+rWLWnMxg5Ums3OXvsMULEI8AIMaVoExeQ3ViCOWHxXsJ/+X G9ywOs91XUfli+6X3U3wwQ4UUvnYSWCP2gMD//zENXvGByb2aj+0EnC5toPXHtT77KU5 jo3A== X-Gm-Message-State: ALoCoQmKkpfno4BJX1Klf9RlMZOqeHYaqfOCNnIiyr/SLLr10O7gEwn1Y+ROEVcls5dvr023h+2C X-Received: by 10.180.208.12 with SMTP id ma12mr1045692wic.6.1426704415244; Wed, 18 Mar 2015 11:46:55 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.135 with SMTP id t7ls191500lag.45.gmail; Wed, 18 Mar 2015 11:46:55 -0700 (PDT) X-Received: by 10.112.146.129 with SMTP id tc1mr43187602lbb.27.1426704415075; Wed, 18 Mar 2015 11:46:55 -0700 (PDT) Received: from mail-lb0-f175.google.com (mail-lb0-f175.google.com. [209.85.217.175]) by mx.google.com with ESMTPS id j9si13536286lbc.32.2015.03.18.11.46.55 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Mar 2015 11:46:55 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.175 as permitted sender) client-ip=209.85.217.175; Received: by lbnq5 with SMTP id q5so8409959lbn.0 for ; Wed, 18 Mar 2015 11:46:55 -0700 (PDT) X-Received: by 10.112.8.101 with SMTP id q5mr60046038lba.19.1426704414933; Wed, 18 Mar 2015 11:46:54 -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 h5csp1338485lbj; Wed, 18 Mar 2015 11:46:54 -0700 (PDT) X-Received: by 10.70.91.131 with SMTP id ce3mr155348313pdb.30.1426704412995; Wed, 18 Mar 2015 11:46:52 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ac10si37663307pac.147.2015.03.18.11.46.49; Wed, 18 Mar 2015 11:46:52 -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 S1756802AbbCRSqa (ORCPT + 11 others); Wed, 18 Mar 2015 14:46:30 -0400 Received: from mail-wg0-f46.google.com ([74.125.82.46]:32859 "EHLO mail-wg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756269AbbCRSq2 (ORCPT ); Wed, 18 Mar 2015 14:46:28 -0400 Received: by wgbcc7 with SMTP id cc7so42926430wgb.0 for ; Wed, 18 Mar 2015 11:46:27 -0700 (PDT) X-Received: by 10.194.220.7 with SMTP id ps7mr148101996wjc.84.1426704386918; Wed, 18 Mar 2015 11:46:26 -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.24 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Mar 2015 11:46:26 -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 5/8] ARM64: cpuidle: Remove arm64 reference Date: Wed, 18 Mar 2015 19:46:09 +0100 Message-Id: <1426704372-20406-6-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: 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.175 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 --- 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);