From patchwork Thu Dec 19 22:53:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 182197 Delivered-To: patch@linaro.org Received: by 2002:a92:d0a:0:0:0:0:0 with SMTP id 10csp1112457iln; Thu, 19 Dec 2019 14:53:36 -0800 (PST) X-Google-Smtp-Source: APXvYqwlHx4yXGZmMOCAnRmO5R7dbX3Ucf4MtxkeFDZg3tY//dL1GogNXB17LesTAz5OzMxDqIOC X-Received: by 2002:a9d:4706:: with SMTP id a6mr10504413otf.331.1576796016294; Thu, 19 Dec 2019 14:53:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576796016; cv=none; d=google.com; s=arc-20160816; b=TzIpA2kooISkSWweY+xUFUJuiYRMIeMaTN5kDseNRvOpxMHKcziXfEoBCVFSGwlHUQ 9xuMHg08KxCk73BFIcL1hoMjvmQQh+4uCbomjnu4ihzG+bvTJ3hn+0uq6KTqlZcdR2yj FI1zPEn2+H1ommFXVhYiLmu17VzhuK2Cc1KcEIHzIj0xZE9gGLqpoLgIDpuWh6Jq4dAv 4mNBaih0lirKBVWRpjfJ4vGRuTCjl8k7CGHZkYkR7JTjkFKVEnvyDhDrnSBB86AP2Tdg y4cTK0l52XcCvasp9Vc6peLrAfhO4eGp/3wrPB7bEZZ0aIQZ4c4jVMZjJgjsMaGGkxeN RhjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=sBcrCTViVT+buUkazP6ndZ+R56LFcmai8/NG1/x431U=; b=Efqu4joWNOCEHHZzk1ND1Y12dYwMvN1pZnzwHQAnmN8aSojPbn6xVmp1WH6hUqJY5T lj/D9O851orxS2yTvN8EC7YRufhu6JtfQuKgyqehKMpW3mx+Dp+s+Jl0tKuZKa7aV71l YNtk5tBrXMko6hYfcaQwfumqXCX1TaxQj8942Q6aQFtUSv5frPxwQszGBNOX4/HNNHpv olkRQsrGlL9XJ6D1t7XsddtzxyvokWxVGpCC0HmOs/LFS0YUys/mBkaNX1JRgXC6m+nv JoS70m9/cqKWABSaPqNru9isfY2sxhYoxtYH6mPzAQo76TSO70gJhj9O598whxfJpFMP oyBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Hms1C9No; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n14si4249041otk.179.2019.12.19.14.53.36; Thu, 19 Dec 2019 14:53:36 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Hms1C9No; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727165AbfLSWxc (ORCPT + 27 others); Thu, 19 Dec 2019 17:53:32 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:36308 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726967AbfLSWx2 (ORCPT ); Thu, 19 Dec 2019 17:53:28 -0500 Received: by mail-wm1-f67.google.com with SMTP id p17so7346116wma.1 for ; Thu, 19 Dec 2019 14:53:26 -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=Hms1C9NofkMz6T1NTyhmVkYBl4ZPR7sI0C/LuYX9azSAlOO86De1fu3PgyXmOMRvte itWwqN+xHdp5diEsP7/PESs26jSYQOclJLteh1XsXEP02pJfChBbLTCtB+PVjphI+7Hz mgEqJ5xkwnF9YNciYBf/kcbt+ID0414YTZ4EumCnlW9DjglCbhx0IzKevZi3lV2oHLwW 25zbP/9sARVfASSZh50LdwUocnkQwtpVuVjO+WdneaBkIGwVueeLx+CUvneZ3mPJFPys jlJKsHkEJsegERjNFfX2gS3m4w1HbdvOykn1orsUOLbq5FH3il7mi7tcBDiJDCFYpYk5 zb6w== 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=VVO7tc39aYfYV0hP1ExHG3fDqeVX9vwO03EmivoeVDJ8VCfQ6I/HOidrylJgh9MiNa A1a0PKrc3BgEGy7+U4YRg8r+S7CDVWhLG/Iz/xM1B+zzaT2GX2Dkb06GndkF1AvdNLlu ixg6dVO8zc+HKmGUTzYBoJZ7GbvpGgV8h2dnLeUQZHOo4NwifM+9CsE1q8yH9kZ5IH5D PGPVp0f1VhlfjqMXgZ+G6OrXX8InUvrP9OvspsW+fdjhcRuMaqCFi4x5NLMvvW2mID/e ICWj67ID7AYdt6y3ud+qV6kK7S5jL5uYy48RHa2OrHvh02HITkqjDsTwgGmFEUDEV6Sa 0pIw== X-Gm-Message-State: APjAAAWwil1Z6x63jmGRH7UKtiemiVRnyZZOaor7IYMQNM2/9LTil3PW 5thbiMaM0lxK94IMME2UcDM3CQ== X-Received: by 2002:a7b:c151:: with SMTP id z17mr12575389wmi.137.1576796006039; Thu, 19 Dec 2019 14:53:26 -0800 (PST) Received: from localhost.localdomain ([2a01:e34:ed2f:f020:58d:4e9b:2833:86c3]) by smtp.gmail.com with ESMTPSA id p15sm7581930wma.40.2019.12.19.14.53.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 14:53:25 -0800 (PST) From: Daniel Lezcano To: daniel.lezcano@linaro.org, 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 V6 3/3] thermal/drivers/cpu_cooling: Rename to cpufreq_cooling Date: Thu, 19 Dec 2019 23:53:17 +0100 Message-Id: <20191219225317.17158-3-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191219225317.17158-1-daniel.lezcano@linaro.org> References: <20191219225317.17158-1-daniel.lezcano@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 --- 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%) -- 2.17.1 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 */