From patchwork Mon Feb 15 10:10:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Haslam X-Patchwork-Id: 8312261 X-Patchwork-Delegate: rjw@sisk.pl Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A13D99F6E7 for ; Mon, 15 Feb 2016 10:11:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B1F3020416 for ; Mon, 15 Feb 2016 10:11:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B6B6E2051D for ; Mon, 15 Feb 2016 10:11:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752610AbcBOKLN (ORCPT ); Mon, 15 Feb 2016 05:11:13 -0500 Received: from mail-wm0-f41.google.com ([74.125.82.41]:35699 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752718AbcBOKLJ (ORCPT ); Mon, 15 Feb 2016 05:11:09 -0500 Received: by mail-wm0-f41.google.com with SMTP id c200so105143905wme.0 for ; Mon, 15 Feb 2016 02:11:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZGNG5o7kDgPg+SEh/QjiMCMoOxzm2bNBswWeMvb1FJ0=; b=dm+7U3dOBqI5MP3ejAFcu+FGp7DH8Dz/6ButWoE5EBaCBkZlyRZ3itGKqphJsqiyG9 LFncqGtIDT52wWjG3bLj4BEaOdzIAA30ijpYcdB0gCaGVH3evcgK7HFtyDaVfCStUtWa AdhVRR0P5y22UH1bIYPxbMK/wE2qK10imUj20Uf5qiiVQotRGzSNRpGGW9YiyZgirYRo UDdC1Ufibbe4V9JC5rXMrGmvo8rGADCKMotNmr5X+yX2Ap2TFjy115ZkQRP9V9aUwHUS nueVcL+4J+NpPEioSfhbxbqCiNWN+3SQiyMXVcQQRqLJDiHdkYoODQs/hdZNM0iQJ4to CVJQ== 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=ZGNG5o7kDgPg+SEh/QjiMCMoOxzm2bNBswWeMvb1FJ0=; b=H4BvCJn5I3w5KG4XNslCR3oKmeOTWkGM1m0MPAIOfarmmBxEsxJxOJ60T5sdSDgvwg Nsdg9BJF0pd2FUk4mgdp1Uw4VSIPRuqSn2sGLc4P/mPKe/m1E5ZUm5lNwT+ldZer/Xy/ gSmrWQIFQNciTtNNBNR/29oF8xF1A87v/+QB+rmPQdcpMui30m9XI4d2GB1nnFtCeHIt 0Se4FI5mVV8DoOkA/Qtb/Mop54B7mc/DV3bPAPbjEzej2YKOy4i+bv+vbkpNNEU/vLo6 Xvxa33tMDdhPEuif6k54amkWH8Va82wwEoWgwjis/MjXMqift8gnf8XoAb0aDbZGEcJg yfDQ== X-Gm-Message-State: AG10YOSMnsVUIFZV0A3i5DZNCBJZzb+l0jCQwQz5hUz1RtlUD+8nk0DK7spmWMoP8o7ODSgq X-Received: by 10.194.205.8 with SMTP id lc8mr14640953wjc.177.1455531068216; Mon, 15 Feb 2016 02:11:08 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id q75sm14991499wmd.6.2016.02.15.02.11.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 15 Feb 2016 02:11:07 -0800 (PST) From: ahaslam@baylibre.com To: ulf.hansson@linaro.org, lina.iyer@linaro.org Cc: khilman@baylibre.com, linux-pm@vger.kernel.org, geert@linux-m68k.org, mtitinger@baylibre.com, rjw@rjwysocki.net, bcousson@baylibre.com, Axel Haslam Subject: [PATCH v12 3/3] PM / Domains: remove old power on/off latencies. Date: Mon, 15 Feb 2016 11:10:53 +0100 Message-Id: <1455531053-11291-4-git-send-email-ahaslam@baylibre.com> X-Mailer: git-send-email 2.6.3 In-Reply-To: <1455531053-11291-1-git-send-email-ahaslam@baylibre.com> References: <1455531053-11291-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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,TVD_SUBJ_WIPE_DEBT,T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 | 8 +------- include/linux/pm_domain.h | 2 -- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 4c6f46b..e8ca290 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -1523,14 +1523,8 @@ void pm_genpd_init(struct generic_pm_domain *genpd, } /* Use only one "off" state if there were no states declared */ - if (genpd->state_count == 0) { - genpd->states[0].power_on_latency_ns = - genpd->power_on_latency_ns; - genpd->states[0].power_off_latency_ns = - genpd->power_off_latency_ns; - + if (genpd->state_count == 0) genpd->state_count = 1; - } mutex_lock(&gpd_list_lock); list_add(&genpd->gpd_list_node, &gpd_list); diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index 1726c4a..49cd8890 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -61,9 +61,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;