From patchwork Tue Dec 3 09:37:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 180717 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp1266286ile; Tue, 3 Dec 2019 01:37:19 -0800 (PST) X-Google-Smtp-Source: APXvYqytvddf+9Gu/aN+sDpT4LeSlL8/zneCrx7NeWEW7EgZSBfdcassd8PkmkHgNlJdRrXudCvB X-Received: by 2002:a9d:6f85:: with SMTP id h5mr2487566otq.19.1575365839359; Tue, 03 Dec 2019 01:37:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575365839; cv=none; d=google.com; s=arc-20160816; b=vEzuzMY0Qi6PzxMcLt/Fj4hdXkMXLf4GUYllHLtKSWpboXX9FJ5C/EeFyr9WyUVidx z3Ivtd0mKQyyAyn/H8Lo3Wm6m8sGUJMqJv6JfmsiSCQhTvZThpEdVxL6vcFAJwVck6+/ CfBBTydmO2WVJhpo3d5ctZkInDuDuXGRf3DB45bOHje7SGr09Vla5JfPYOXbvi6sCcPY d/8Esd2RD8Ql8aqJKOTMta6zxcxBieX5UJTYnweXVgpN4eh0tNXsJcAB2AvnPKeMhXlt cdS5XIoAzGt3sK2QwuZ44Vgjm0JBWRtc+hPEZXouBnmJSMeqNM7c8W5iiGFoSkmP4AWQ FXgA== 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=n1V4m5uHfTZUZxbvB/zT+U3+jIt/r2ueCcg5F/IHP4U=; b=ItBDFZRsnfQfciAAabN3wl4AcH/vwYVhTMMvAB4qoZCvVde0SZA6XVaKoLhRz6t7lX DcwrVNoMj53AL4QgrIdSbXXPStpR6ZJSuAZI+y2d50/bcWKaI/W5tkhXTf+KtnfURSfx esvNvy/W0kfMR3O8nteuVacP0kxEpBwbigGpWXq3HI5iZa8DeQfwlUH/c7D0e+txi5Sy mPe96go3FA+NaZRy3a5RPZejIMJy5ccY/X9R/PfpLCC87fCO+eLfQO1ylfldf80YVlJy 8X+znroFn60sCryQiJTkrYtsx1UQOuArmmqbj3hRd7wfOzTlk7bz8X3X1lUCxCUA77W5 FVtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=E65o8Gbh; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-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 p25si977149oto.191.2019.12.03.01.37.19; Tue, 03 Dec 2019 01:37:19 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-pm-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=E65o8Gbh; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-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 S1726365AbfLCJhS (ORCPT + 10 others); Tue, 3 Dec 2019 04:37:18 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:37918 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726386AbfLCJhS (ORCPT ); Tue, 3 Dec 2019 04:37:18 -0500 Received: by mail-wr1-f68.google.com with SMTP id y17so2768406wrh.5 for ; Tue, 03 Dec 2019 01:37:15 -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=n1V4m5uHfTZUZxbvB/zT+U3+jIt/r2ueCcg5F/IHP4U=; b=E65o8GbhaN6dhsWwqzOmls+WOicYbtpQe1WLFww2Jaa7JRztNoOiGZ1KrFWIh7zroa PD3m16AUfEZovja7lfC1k64JxzC1hmTdp7WHe7tGzNB9iXuyUR3Sv1Z0dH1S7tCMx30N cQDUdtZNMQuQKrytVyqyB9a8sWZ4wGV55Rsvb5vj4evXM/2omPE92xA2TQ6i6L/U8YT0 z8QnLUuCWiyXCVpdhJS3s4LFc/YsSdeDrdNf4khoh2erPEN/qQJqXyvCEPDWgfAJePgW pFHmVbBmDN9BjHHOHVcntF6yAo27fTWTeDVByAWFYHnYaLg9mdx9jz8IfIvJ3YuOdDRu qP8Q== 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=n1V4m5uHfTZUZxbvB/zT+U3+jIt/r2ueCcg5F/IHP4U=; b=hAoiTxYUGh2ETEuJpv85GM7SoyWPD1lmQaP5IVFH50timNQ6szxrWmzvzr5wsZz73+ QCK2L/dlvNZB6/7S0mbuj99iUn4tSWTzZ31Uxb3EhTxqHHb1tXgah1JVOTUbVFIeeGDz W4JAOma3OKfwfBLiw0SSeDaDu4UqpZZqryn+YB2OWVXsaZ9JTbE93K1C68JHKgTrNc+G tObsVLo3XwJWgBHJ0mhUKRrgd2RQIMh547UgZAbW856LSwLK1tgTvlKxjSi7VCnaXx+B dZEoteqwuSCbqThWUi9nbzWqiL0FhfT9WI6uwu6eyk3XM5+0pJLwtxzHPw2vhnLtSzd9 m7Qg== X-Gm-Message-State: APjAAAXjkGhB5tK4bLvw3vZYJLdjTkUulOovPffREvhj3xReY9mInfo0 kCJ3I+HrGKASdMtUTfrEX9RXtA== X-Received: by 2002:adf:f411:: with SMTP id g17mr3958312wro.89.1575365834904; Tue, 03 Dec 2019 01:37:14 -0800 (PST) Received: from localhost.localdomain ([2a01:e34:ed2f:f020:8196:cbcc:fb2c:4975]) by smtp.gmail.com with ESMTPSA id w13sm2935751wru.38.2019.12.03.01.37.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Dec 2019 01:37:14 -0800 (PST) From: Daniel Lezcano To: viresh.kumar@linaro.org, rui.zhang@intel.com Cc: rjw@rjwysocki.net, edubezval@gmail.com, linux-pm@vger.kernel.org, amit.kucheria@linaro.org, linux-kernel@vger.kernel.org Subject: [PATCH V3 4/4] thermal/drivers/cpu_cooling: Rename to cpufreq_cooling Date: Tue, 3 Dec 2019 10:37:04 +0100 Message-Id: <20191203093704.7037-4-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191203093704.7037-1-daniel.lezcano@linaro.org> References: <20191203093704.7037-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 --- 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 Acked-by: Viresh Kumar Reviewed-by: Amit Kucheria 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 d2e92a0360f2..26e4be914765 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16194,7 +16194,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 9c8aa2d4bd28..5c98472ffd8b 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 6b9865c786ba..3a3f9cf94b6d 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) * @@ -694,7 +694,7 @@ of_cpufreq_cooling_register(struct cpufreq_policy *policy) u32 capacitance = 0; 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; } @@ -705,7 +705,7 @@ of_cpufreq_cooling_register(struct cpufreq_policy *policy) cdev = __cpufreq_cooling_register(np, policy, capacitance); 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 */