From patchwork Wed Dec 11 22:43:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 11286503 X-Patchwork-Delegate: daniel.lezcano@linaro.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F254D138C for ; Wed, 11 Dec 2019 22:44:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C719C21556 for ; Wed, 11 Dec 2019 22:44:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="B0n4QzR+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726903AbfLKWoJ (ORCPT ); Wed, 11 Dec 2019 17:44:09 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:37402 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726847AbfLKWoG (ORCPT ); Wed, 11 Dec 2019 17:44:06 -0500 Received: by mail-wr1-f66.google.com with SMTP id w15so471053wru.4 for ; Wed, 11 Dec 2019 14:44:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sBcrCTViVT+buUkazP6ndZ+R56LFcmai8/NG1/x431U=; b=B0n4QzR+8Dn/PNjTG+BqYKuWbD7QPHneTDLFVbLSZ2vbKcCA8M0sPy1gbo7O2ooZPv 81yQDTKkSE5CACbD71h/ZRug72pThiHj68475hZLEbnQS4D9qYhGm+/+4ZcAJ224d03+ sKe+LTGrbqsqKUtyjtfLVzngNo65pmDx4kPQS+Lb2Fe+zBeNyVBerBw/1PfAuy9ksv/9 WCGhsGUoDHWvVSR52Y3IHoie5IVwAp9RyMAUVJmdiJ9/DxUtqKA8eBduUWskwkbWM1oN i2g0qGyQ/wkpVeRmfQZAlmlccmsYXUH/jmHpllykYndBPlcoup6xnCznmwTe9zkhPGJC duuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=sBcrCTViVT+buUkazP6ndZ+R56LFcmai8/NG1/x431U=; b=eceLmLR76UF997DWILujCrgh89j1cUKu6xbJXkPBU5BovE0SFJo6h2YZX2YXZ20cRC QMlrYyicICXFxdw737IT/SuWOdVHuLWXh5CTjcEGzkt9dw7AZR1xKXnWEGbUqTuow3N3 sz+WBoyO2FYRyqhwRatdeOGW3MjJYVDLhNax0hSuzzFCzvRGaxdw87dKEgZNGOEGjClg J7lCsZi+HsmJZV1jBbmQI+HiAuun3wtM5iNiDCM6//LjuQ087nsEFFaIXrF1lYtZAHIS DYD3zH7KHYi0hDkxuPBv+0yFdRW0ru9ruLod1v/MGPlcw34wqTSz1a9zQ+VZ3S3mKW6e ijyQ== X-Gm-Message-State: APjAAAXmaaLg6f1JvGsWds23wrKAJokLPNX5KfITpz4QN5qwBJL9zqrG inLxXVLHO7ARwk3wAsfpIfqQSg== X-Google-Smtp-Source: APXvYqz4GwmnjA7mmxVpsbblUSVVcWN4dL2VXX9f+0XX77fYyTKNWiKW4FuKn2UvcmWm6MdGH0hMKA== X-Received: by 2002:adf:9144:: with SMTP id j62mr2300204wrj.168.1576104243820; Wed, 11 Dec 2019 14:44:03 -0800 (PST) Received: from localhost.localdomain ([2a01:e34:ed2f:f020:48f7:48fb:71cb:f13a]) by smtp.gmail.com with ESMTPSA id s16sm3798809wrn.78.2019.12.11.14.44.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 14:44:03 -0800 (PST) From: Daniel Lezcano To: rui.zhang@intel.com Cc: rjw@rjwysocki.net, linux-pm@vger.kernel.org, viresh.kumar@linaro.org, amit.kucheria@linaro.org, linux-kernel@vger.kernel.org, martin.kepplinger@puri.sm Subject: [PATCH V5 3/3] thermal/drivers/cpu_cooling: Rename to cpufreq_cooling Date: Wed, 11 Dec 2019 23:43:47 +0100 Message-Id: <20191211224347.1001-3-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191211224347.1001-1-daniel.lezcano@linaro.org> References: <20191211224347.1001-1-daniel.lezcano@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org As we introduced the idle injection cooling device called cpuidle_cooling, let's be consistent and rename the cpu_cooling to cpufreq_cooling as this one mitigates with OPPs changes. Signed-off-by: Daniel Lezcano Acked-by: Viresh Kumar Reviewed-by: Amit Kucheria Tested-by: Martin Kepplinger --- V4: - Added Acked-by and Reviewed-by V3: - Fix missing name conversion (Viresh Kumar) --- Documentation/driver-api/thermal/exynos_thermal.rst | 2 +- MAINTAINERS | 2 +- drivers/thermal/Makefile | 2 +- drivers/thermal/clock_cooling.c | 2 +- drivers/thermal/{cpu_cooling.c => cpufreq_cooling.c} | 6 +++--- include/linux/clock_cooling.h | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) rename drivers/thermal/{cpu_cooling.c => cpufreq_cooling.c} (99%) diff --git a/Documentation/driver-api/thermal/exynos_thermal.rst b/Documentation/driver-api/thermal/exynos_thermal.rst index 5bd556566c70..d4e4a5b75805 100644 --- a/Documentation/driver-api/thermal/exynos_thermal.rst +++ b/Documentation/driver-api/thermal/exynos_thermal.rst @@ -67,7 +67,7 @@ TMU driver description: The exynos thermal driver is structured as:: Kernel Core thermal framework - (thermal_core.c, step_wise.c, cpu_cooling.c) + (thermal_core.c, step_wise.c, cpufreq_cooling.c) ^ | | diff --git a/MAINTAINERS b/MAINTAINERS index d92e9eb14131..0d658a628296 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16337,7 +16337,7 @@ L: linux-pm@vger.kernel.org S: Supported F: Documentation/driver-api/thermal/cpu-cooling-api.rst F: Documentation/driver-api/thermal/cpu-idle-cooling.rst -F: drivers/thermal/cpu_cooling.c +F: drivers/thermal/cpufreq_cooling.c F: drivers/thermal/cpuidle_cooling.c F: include/linux/cpu_cooling.h diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile index 6929e6fad1ac..d502a597a717 100644 --- a/drivers/thermal/Makefile +++ b/drivers/thermal/Makefile @@ -19,7 +19,7 @@ thermal_sys-$(CONFIG_THERMAL_GOV_USER_SPACE) += user_space.o thermal_sys-$(CONFIG_THERMAL_GOV_POWER_ALLOCATOR) += power_allocator.o # cpufreq cooling -thermal_sys-$(CONFIG_CPU_FREQ_THERMAL) += cpu_cooling.o +thermal_sys-$(CONFIG_CPU_FREQ_THERMAL) += cpufreq_cooling.o thermal_sys-$(CONFIG_CPU_IDLE_THERMAL) += cpuidle_cooling.o # clock cooling diff --git a/drivers/thermal/clock_cooling.c b/drivers/thermal/clock_cooling.c index 3ad3256c48fd..7cb3ae4b44ee 100644 --- a/drivers/thermal/clock_cooling.c +++ b/drivers/thermal/clock_cooling.c @@ -7,7 +7,7 @@ * Copyright (C) 2013 Texas Instruments Inc. * Contact: Eduardo Valentin * - * Highly based on cpu_cooling.c. + * Highly based on cpufreq_cooling.c. * Copyright (C) 2012 Samsung Electronics Co., Ltd(http://www.samsung.com) * Copyright (C) 2012 Amit Daniel */ diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpufreq_cooling.c similarity index 99% rename from drivers/thermal/cpu_cooling.c rename to drivers/thermal/cpufreq_cooling.c index 52569b27b426..1dcba6bcaf7b 100644 --- a/drivers/thermal/cpu_cooling.c +++ b/drivers/thermal/cpufreq_cooling.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * linux/drivers/thermal/cpu_cooling.c + * linux/drivers/thermal/cpufreq_cooling.c * * Copyright (C) 2012 Samsung Electronics Co., Ltd(http://www.samsung.com) * @@ -620,7 +620,7 @@ of_cpufreq_cooling_register(struct cpufreq_policy *policy) struct thermal_cooling_device *cdev = NULL; if (!np) { - pr_err("cpu_cooling: OF node not available for cpu%d\n", + pr_err("cpufreq_cooling: OF node not available for cpu%d\n", policy->cpu); return NULL; } @@ -630,7 +630,7 @@ of_cpufreq_cooling_register(struct cpufreq_policy *policy) cdev = __cpufreq_cooling_register(np, policy, em); if (IS_ERR(cdev)) { - pr_err("cpu_cooling: cpu%d failed to register as cooling device: %ld\n", + pr_err("cpufreq_cooling: cpu%d failed to register as cooling device: %ld\n", policy->cpu, PTR_ERR(cdev)); cdev = NULL; } diff --git a/include/linux/clock_cooling.h b/include/linux/clock_cooling.h index b5cebf766e02..4b0a69863656 100644 --- a/include/linux/clock_cooling.h +++ b/include/linux/clock_cooling.h @@ -7,7 +7,7 @@ * Copyright (C) 2013 Texas Instruments Inc. * Contact: Eduardo Valentin * - * Highly based on cpu_cooling.c. + * Highly based on cpufreq_cooling.c. * Copyright (C) 2012 Samsung Electronics Co., Ltd(http://www.samsung.com) * Copyright (C) 2012 Amit Daniel */