From patchwork Tue Oct 20 13:26:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Haslam X-Patchwork-Id: 7447401 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8C711BEEA4 for ; Tue, 20 Oct 2015 13:27:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A389020867 for ; Tue, 20 Oct 2015 13:27:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BE38A2073A for ; Tue, 20 Oct 2015 13:27:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752866AbbJTN0z (ORCPT ); Tue, 20 Oct 2015 09:26:55 -0400 Received: from mail-wi0-f180.google.com ([209.85.212.180]:36071 "EHLO mail-wi0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752768AbbJTN0u (ORCPT ); Tue, 20 Oct 2015 09:26:50 -0400 Received: by wicfx6 with SMTP id fx6so45650358wic.1 for ; Tue, 20 Oct 2015 06:26:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=oDFRjNxecFPnHv8eBSBeTmpiMBYa+wwiKR117xcZxjU=; b=lZBpeZ+v0ei3ooWLL+kEIyomlhZnL5nPoLBC53VbSzOJq94Cdo9tLEN02pm5a3icvm HuVkTEX6ikg2xmdUqEAD+m0tZfKxpKolmBXgju8n1lpFHaGTpolFGVm8d5TUHy2+e9Bq eBPjvbFnofc/4CRhyNC0do3pfKfsjA6/zP8kgFB3KRnSMd2BoPrWwpJ/qmthXHD1qVxP DGeevRIj++sbjQqOXV+hVe3V2VaXRq6QKEWkWLx73X6mqfYqW6C2XnIJ5qYTWh05szN3 d5wx17RLdxYD8jDQDWg2b/0H2uHrtXfqsLIbAB3UWuyVO2oHfj5OZvzb3iVAzDr292K5 NnuA== X-Gm-Message-State: ALoCoQkkpraJvax5150SzEgH0xVWSpuDGkluK1my8SpGrmj0Ibvrs18o71IjZY8L+mTFi+v1td2J X-Received: by 10.180.35.163 with SMTP id i3mr4305328wij.80.1445347609797; Tue, 20 Oct 2015 06:26:49 -0700 (PDT) Received: from localhost.localdomain (cag06-6-78-235-100-105.fbx.proxad.net. [78.235.100.105]) by smtp.gmail.com with ESMTPSA id uq5sm3905098wjc.3.2015.10.20.06.26.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Oct 2015 06:26:49 -0700 (PDT) From: ahaslam@baylibre.com To: khilman@linaro.org, ulf.hansson@linaro.org, lina.iyer@linaro.org, geert@glider.be, k.kozlowski.k@gmail.com, rjw@rjwysocki.net, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: bcousson@baylibre.com, mturquette@baylibre.com, Axel Haslam Subject: [PATCH v10 5/6] PM / Domains: remove old power on/off latencies. Date: Tue, 20 Oct 2015 15:26:28 +0200 Message-Id: <1445347589-5626-6-git-send-email-ahaslam@baylibre.com> X-Mailer: git-send-email 2.4.5 In-Reply-To: <1445347589-5626-1-git-send-email-ahaslam@baylibre.com> References: <1445347589-5626-1-git-send-email-ahaslam@baylibre.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-5.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, TVD_SUBJ_WIPE_DEBT, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Axel Haslam Now that all known users have been converted to use state latencies, we can remove the latency field in the generic_pm_domain structure. Signed-off-by: Axel Haslam --- drivers/base/power/domain.c | 15 --------------- include/linux/pm_domain.h | 2 -- 2 files changed, 17 deletions(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 2ffee65..dbab367 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -1239,21 +1239,6 @@ static int genpd_alloc_states_data(struct generic_pm_domain *genpd, st[i].power_off_latency_ns; } - /* - * Copy the latency values To keep compatibility with - * platforms that are not converted to use the multiple states. - * This will be removed once all platforms are converted to use - * multiple states. note that non converted platforms will use the - * default single off state. - */ - if (genpd->power_on_latency_ns != 0) - genpd->states[0].power_on_latency_ns = - genpd->power_on_latency_ns; - - if (genpd->power_off_latency_ns != 0) - genpd->states[0].power_off_latency_ns = - genpd->power_off_latency_ns; - genpd->state_count = st_count; /* to save memory, Name allocation will happen if debug is enabled */ diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index 3129f85..ff576e4 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -65,9 +65,7 @@ struct generic_pm_domain { unsigned int prepared_count; /* Suspend counter of prepared devices */ bool suspend_power_off; /* Power status before system suspend */ int (*power_off)(struct generic_pm_domain *domain); - s64 power_off_latency_ns; int (*power_on)(struct generic_pm_domain *domain); - s64 power_on_latency_ns; struct gpd_dev_ops dev_ops; s64 max_off_time_ns; /* Maximum allowed "suspended" time. */ bool max_off_time_changed;