From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BCB4AC64E8A for ; Wed, 2 Dec 2020 12:08:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 614FE221FE for ; Wed, 2 Dec 2020 12:08:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727349AbgLBMH7 (ORCPT ); Wed, 2 Dec 2020 07:07:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726928AbgLBMH6 (ORCPT ); Wed, 2 Dec 2020 07:07:58 -0500 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CF1DC0613D4 for ; Wed, 2 Dec 2020 04:07:18 -0800 (PST) Received: by mail-wr1-x443.google.com with SMTP id s8so3585021wrw.10 for ; Wed, 02 Dec 2020 04:07:18 -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; bh=N0N1NFLUe7mxMhyhl9qWKG4HrWaDY+W8Cz0CyGfPy4Y=; b=hSy6vvc42xNZgz4wWHl4kIJ+4OtfVSy0bjNkPEsCHY7lkrmWhUTff/ezw9mjHlNCKr t+rkZjQqnEiCo5wNH+vr5CldwI8jrVbaAMmnQeTL1q7lHyCx4KDEQsZlY2ZE/Omw9NH/ tHC/ZmcGiInHlFExLX5uGdEma5XwrG0JKZgzxTdYn7kDvHTOB5NKE+YYxU9UMAJsPi/1 ELCm3Jd8nXlmbb7qnJIUYxnz29vzWVaVt1MF4ORXtIWv1mfi4GFFw5SwhtqfK+xJzXic fEku5zdiQpniSw8ymr+vP1JJjUJvC5JIRAhvdYWBFkO4JFd1Aef0rEf8/W0TgXpPtqOj nh7w== 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=N0N1NFLUe7mxMhyhl9qWKG4HrWaDY+W8Cz0CyGfPy4Y=; b=FanISX4dHUNcgN5KZdxtTUiseenAnualfNyRdg8lxI5NaR3lRpTLkermbgauKHzpZx ujsihKB4z7YtH2oO/2K69Dbqqin/gRqEwW1sBbhaDumc7llhwWqzKK9F8P/nCJFzdOSi BGWEcoH5efaOQQNziGMHH9LDftPyCYjeZp3MUIrEJRa3sq2PVe2B4o3vYySSAaxPr1vl sRoFMeKU918JavhqDQBvgsYLrZ+H/1vNhmXoTHPa1Lf0KhmRnnZkMRoibIQpjkm+XelW MnDSGXR5H7lE6DHzX82+LnG3TmYNZgoTfLkO5IRqUyJOQ8bBywDMEQWBLRk83L4V7/ki pVKA== X-Gm-Message-State: AOAM530JNPcivOs+KsfT46a1GskJssyKFI772DapQCukouGhXOxn8uCE ZdDuvVAgisYNd0BAHW7UwG80wQ== X-Google-Smtp-Source: ABdhPJx86cxBM9BKeDFB0Z8T50befSXGthi4QGt1wI9arwTytWwW982hrDf9Cob/3fi6dEhpP37FxA== X-Received: by 2002:a5d:49ce:: with SMTP id t14mr3036168wrs.75.1606910836890; Wed, 02 Dec 2020 04:07:16 -0800 (PST) Received: from localhost.localdomain (lns-bzn-59-82-252-140-184.adsl.proxad.net. [82.252.140.184]) by smtp.gmail.com with ESMTPSA id c1sm1755132wml.8.2020.12.02.04.07.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Dec 2020 04:07:16 -0800 (PST) From: Daniel Lezcano To: daniel.lezcano@linaro.org, rui.zhang@intel.com Cc: amitk@kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCH 1/4] thermal/core: Rename passive_delay and polling_delay with units Date: Wed, 2 Dec 2020 13:06:54 +0100 Message-Id: <20201202120657.1969-1-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Set the scene to directly store the delays under their jiffies form. Add to the variable name the 'ms' suffix. Signed-off-by: Daniel Lezcano --- drivers/thermal/thermal_core.c | 10 +++++----- drivers/thermal/thermal_of.c | 8 ++++---- drivers/thermal/thermal_sysfs.c | 6 +++--- include/linux/thermal.h | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 90e38cc199f4..53f55ceca220 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -317,9 +317,9 @@ static void monitor_thermal_zone(struct thermal_zone_device *tz) mutex_lock(&tz->lock); if (!stop && tz->passive) - thermal_zone_device_set_polling(tz, tz->passive_delay); - else if (!stop && tz->polling_delay) - thermal_zone_device_set_polling(tz, tz->polling_delay); + thermal_zone_device_set_polling(tz, tz->passive_delay_ms); + else if (!stop && tz->polling_delay_ms) + thermal_zone_device_set_polling(tz, tz->polling_delay_ms); else thermal_zone_device_set_polling(tz, 0); @@ -1340,8 +1340,8 @@ thermal_zone_device_register(const char *type, int trips, int mask, tz->device.class = &thermal_class; tz->devdata = devdata; tz->trips = trips; - tz->passive_delay = passive_delay; - tz->polling_delay = polling_delay; + tz->passive_delay_ms = passive_delay; + tz->polling_delay_ms = polling_delay; /* sys I/F */ /* Add nodes that are always present via .groups */ diff --git a/drivers/thermal/thermal_of.c b/drivers/thermal/thermal_of.c index 69ef12f852b7..ebec4a8a8b5a 100644 --- a/drivers/thermal/thermal_of.c +++ b/drivers/thermal/thermal_of.c @@ -865,14 +865,14 @@ __init *thermal_of_build_thermal_zone(struct device_node *np) pr_err("%pOFn: missing polling-delay-passive property\n", np); goto free_tz; } - tz->passive_delay = prop; + tz->passive_delay_ms = prop; ret = of_property_read_u32(np, "polling-delay", &prop); if (ret < 0) { pr_err("%pOFn: missing polling-delay property\n", np); goto free_tz; } - tz->polling_delay = prop; + tz->polling_delay_ms = prop; /* * REVIST: for now, the thermal framework supports only @@ -1085,8 +1085,8 @@ int __init of_parse_thermal_zones(void) zone = thermal_zone_device_register(child->name, tz->ntrips, mask, tz, ops, tzp, - tz->passive_delay, - tz->polling_delay); + tz->passive_delay_ms, + tz->polling_delay_ms); if (IS_ERR(zone)) { pr_err("Failed to build %pOFn zone %ld\n", child, PTR_ERR(zone)); diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c index 0866e949339b..f465462d8aa1 100644 --- a/drivers/thermal/thermal_sysfs.c +++ b/drivers/thermal/thermal_sysfs.c @@ -233,12 +233,12 @@ passive_store(struct device *dev, struct device_attribute *attr, return -EINVAL; if (state && !tz->forced_passive) { - if (!tz->passive_delay) - tz->passive_delay = 1000; + if (!tz->passive_delay_ms) + tz->passive_delay_ms = 1000; thermal_zone_device_rebind_exception(tz, "Processor", sizeof("Processor")); } else if (!state && tz->forced_passive) { - tz->passive_delay = 0; + tz->passive_delay_ms = 0; thermal_zone_device_unbind_exception(tz, "Processor", sizeof("Processor")); } diff --git a/include/linux/thermal.h b/include/linux/thermal.h index d07ea27e72a9..230d451bf335 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -116,9 +116,9 @@ struct thermal_cooling_device { * @devdata: private pointer for device private data * @trips: number of trip points the thermal zone supports * @trips_disabled; bitmap for disabled trips - * @passive_delay: number of milliseconds to wait between polls when + * @passive_delay_ms: number of milliseconds to wait between polls when * performing passive cooling. - * @polling_delay: number of milliseconds to wait between polls when + * @polling_delay_ms: number of milliseconds to wait between polls when * checking whether trip points have been crossed (0 for * interrupt driven systems) * @temperature: current temperature. This is only for core code, @@ -159,8 +159,8 @@ struct thermal_zone_device { void *devdata; int trips; unsigned long trips_disabled; /* bitmap for disabled trips */ - int passive_delay; - int polling_delay; + int passive_delay_ms; + int polling_delay_ms; int temperature; int last_temperature; int emul_temperature; -- 2.17.1