Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp1794489ybb; Thu, 2 Apr 2020 07:30:46 -0700 (PDT) X-Google-Smtp-Source: APiQypLPh8LsEWgBit+rEc81Za66MzyslLSVd/4YI9+kE9VRse6ReMTDdlHU2aLTa5Oaq9oRw+/C X-Received: by 2002:a05:6830:1159:: with SMTP id x25mr2715256otq.110.1585837845982; Thu, 02 Apr 2020 07:30:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585837845; cv=none; d=google.com; s=arc-20160816; b=CHGAxtzDJtZlIJeIDRQjimtizJqh0pFXtRNDRPTY1J7CyEUzVPSPhIO6oBMYIHcNRX FXAZRXD6opl4iNMqq4QvqOMw4X3SCMEK4nOiui15AxN4i9rmtyiJ7wmdygaMmoAgjVtX lIFoSusCcymC5tWnTtp6zaLK1L7EemHBdKmUafbosWeMr6BxDXrPVFZ2UKGNGBXiXzv1 ISF7s+S/RnWc7mA9EOkPBfjQ4qFuLjoCjth8NNMSu/FxWH2IL4+xGO3NA922ga/2Aijn decG42Nz7PXadIUkA9jE3zcB1BVq+lo7grRHSuZpjTlv05tEtVfcJZZhwOJ8iAwQRlhy 4R2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=L6/ijDa/Jd9lpmxJXYPH3CFr+MtNwUzGkblaHQTuEUE=; b=tSldQNIOtbKfN5jKhsROEcEvZf4aShGKhQDB14T2e720FtpmnLzZf5yqyi3M9PPc3K tJriEHlUlYoV1YOxasgyXCwNBrrWkQskqa5bhPVQFzRAG7pObNwU7LR0rFORWzGLeSZY QOcqYQh8YszLj8yy0/a9XGcA7xsFN25sHvksA0/iTvFM/wy9TxBAVaie7T4vx6/Ht6zw kCRtA+ahRpM29/WE24Dn1Innq51nNI5sbffT6dEvtWqedFIqNCOAnDe3fFKLIJNOuXVI edSkVo8D7jtpxQx4C8sZ0PFUK8QCPAcyZTUM4ZHRu3EVkD/ksoTljsBu9IoNU2Qf9QVk zUtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Cxn+mi5l; 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 e4si2497010oib.135.2020.04.02.07.30.31; Thu, 02 Apr 2020 07:30:45 -0700 (PDT) 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=Cxn+mi5l; 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 S1732598AbgDBO2F (ORCPT + 99 others); Thu, 2 Apr 2020 10:28:05 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:40017 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731874AbgDBO2F (ORCPT ); Thu, 2 Apr 2020 10:28:05 -0400 Received: by mail-wr1-f67.google.com with SMTP id s8so2309422wrt.7 for ; Thu, 02 Apr 2020 07:28:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=L6/ijDa/Jd9lpmxJXYPH3CFr+MtNwUzGkblaHQTuEUE=; b=Cxn+mi5l8LNcQ9ooeTVNyp7YknSO5b0dzRvVoadai2f9VqETOlr7uW+s2jR5paIkPV 9FuWrxFWvscGJ0X8P1sDj7EeEOsKRVjYsEXZcCDsVs26wsti5C56AAdP8QWFz6wXeaHF NTGZzWjxHI8/HKg3RyfaeNaXP8pVJYkQAZamfx953+Gwt7Huv7wc+GXGjUWL73KdYblM cA2Eb5ZO6bdNzqEtRwF6IAJHnjcmBUZRmFK+FDf2gO0lMF5hi8lKxCQijDbjRVwTSM7e qF12rf/yC5hAd5qU1IS5AiCQmgyzVTuMmY9apGgF/1cauc3E5aEndR8dpiFNf1O2XBd8 cqhA== 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; bh=L6/ijDa/Jd9lpmxJXYPH3CFr+MtNwUzGkblaHQTuEUE=; b=LVxWxzYW85sEEuwUIbUHDVRaNdZROGAx8bH1RY+1/pWxXJyaPkqXsQuJIJ/3uZMom8 9bbTRL6glKeSo2MhBaddmxVtDUJetY+5t5Dks7qFO+SgNoXatG4frMW+LnuA74HntlMO EwVEAd9udLyEiZYDtaa5eS0BB6IL8oxBfF8giDWR87TXEVKQPJkfRcLknnUEiSSA2qoM AJ6X5hwLHGXpDRIjVK88VS9W6A8NdT0kuUtVta6zxOC2OVeuoTt/4F07TyHh1S4yv8do hVfqe2iBb3KWHvFHKJCKs31G282uMePQ/qU6aar9soJbSRHg6HJW0e7W4njyA2yDl8zA hO8g== X-Gm-Message-State: AGi0Puatqu3XCN5Uq63mNxvjeYTOl+TuSh0u+tG/t4Ta6luSX7KLzdF5 tjgsBn8403m5ig0ZUTqenEGn3g== X-Received: by 2002:a5d:53ce:: with SMTP id a14mr3711084wrw.129.1585837681758; Thu, 02 Apr 2020 07:28:01 -0700 (PDT) Received: from mai.imgcgcw.net ([2a01:e34:ed2f:f020:4b2:e366:e86f:261a]) by smtp.gmail.com with ESMTPSA id a7sm7045186wmm.34.2020.04.02.07.28.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2020 07:28:01 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, rui.zhang@intel.com Cc: amit.kucheria@verdurent.com, linux-pm@vger.kernel.org (open list:THERMAL), linux-kernel@vger.kernel.org (open list) Subject: [PATCH V2 1/9] thermal: Move default governor config option to the internal header Date: Thu, 2 Apr 2020 16:27:39 +0200 Message-Id: <20200402142747.8307-1-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The default governor set at compilation time is a thermal internal business, no need to export to the global thermal header. Move the config options to the internal header. Signed-off-by: Daniel Lezcano --- drivers/thermal/thermal_core.h | 11 +++++++++++ include/linux/thermal.h | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/thermal/thermal_core.h b/drivers/thermal/thermal_core.h index 37cd4e2bead2..828305508556 100644 --- a/drivers/thermal/thermal_core.h +++ b/drivers/thermal/thermal_core.h @@ -12,6 +12,17 @@ #include #include +/* Default Thermal Governor */ +#if defined(CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE) +#define DEFAULT_THERMAL_GOVERNOR "step_wise" +#elif defined(CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE) +#define DEFAULT_THERMAL_GOVERNOR "fair_share" +#elif defined(CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE) +#define DEFAULT_THERMAL_GOVERNOR "user_space" +#elif defined(CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR) +#define DEFAULT_THERMAL_GOVERNOR "power_allocator" +#endif + /* Initial state of a cooling device during binding */ #define THERMAL_NO_TARGET -1UL diff --git a/include/linux/thermal.h b/include/linux/thermal.h index 448841ab0dca..71cff87dcb46 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -32,17 +32,6 @@ /* use value, which < 0K, to indicate an invalid/uninitialized temperature */ #define THERMAL_TEMP_INVALID -274000 -/* Default Thermal Governor */ -#if defined(CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE) -#define DEFAULT_THERMAL_GOVERNOR "step_wise" -#elif defined(CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE) -#define DEFAULT_THERMAL_GOVERNOR "fair_share" -#elif defined(CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE) -#define DEFAULT_THERMAL_GOVERNOR "user_space" -#elif defined(CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR) -#define DEFAULT_THERMAL_GOVERNOR "power_allocator" -#endif - struct thermal_zone_device; struct thermal_cooling_device; struct thermal_instance; -- 2.17.1