From patchwork Thu Apr 30 10:55:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Haslam X-Patchwork-Id: 6301761 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 F1EB59F859 for ; Thu, 30 Apr 2015 10:57:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 07DFA2020F for ; Thu, 30 Apr 2015 10:57:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E3CB4201B9 for ; Thu, 30 Apr 2015 10:57:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752118AbbD3K5J (ORCPT ); Thu, 30 Apr 2015 06:57:09 -0400 Received: from mail-wi0-f171.google.com ([209.85.212.171]:37038 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751356AbbD3K5I (ORCPT ); Thu, 30 Apr 2015 06:57:08 -0400 Received: by widdi4 with SMTP id di4so13157700wid.0 for ; Thu, 30 Apr 2015 03:57:07 -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=h2TVpcrmUXDIMuGSIUyJJIkGbkW/DhJZ9y+O4g5w/kM=; b=mYJ+TXWB1dpX0Cv/OMS1qfVTx3Zmi5LT5LaGOzO6iSyC4dpDIP7pN0hKUZRQQAIvms LphAl4m3AUD6ZQIjiPvsxbZepYbm37I56xMRBurvev2C8xtDEArSEazPGpfinLLYnC0y E9sXW2hF/lq/D5qvRKz9v+SXH0KFaWiCPXxFQhFm2s/ATAwI6lfppa1KM1OZymhgAk9p Nfed76o4DJUZqdxKz4P4QMdq9QNoOPDNa4XFSuaEroGuaC1T0VKuQ+ywaFfk9S6iVtnZ O1fyd30z1UsSmuEstKS5yDDkZ8wyS54ruzwrMpeq+sMSfn9tAczPzNLd4+5CXrepfQFT yrBQ== X-Gm-Message-State: ALoCoQnfaPYpfLYdcZrE7dz70D1z56tmUkRh6UCPvjPWbPAu5bKNWPVpPEADCNTynwGkMrOeaSTJ X-Received: by 10.180.101.138 with SMTP id fg10mr4470974wib.46.1430391427234; Thu, 30 Apr 2015 03:57:07 -0700 (PDT) Received: from axelh-ThinkPad-T440s.home (LPoitiers-656-1-62-228.w90-63.abo.wanadoo.fr. [90.63.143.228]) by mx.google.com with ESMTPSA id ha4sm1922482wib.0.2015.04.30.03.57.05 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 30 Apr 2015 03:57:06 -0700 (PDT) From: ahaslam@baylibre.com To: ulf.hansson@linaro.org, khilman@linaro.org, k.kozlowski.k@gmail.com, geert@linux-m68k.org, rjw@rjwysocki.net Cc: bcousson@baylibre.com, linux-pm@vger.kernel.org, Axel Haslam Subject: [PATCH v7 5/5] PM / Domains: remove old power on/off latencies. Date: Thu, 30 Apr 2015 12:55:35 +0200 Message-Id: <1430391335-7588-6-git-send-email-ahaslam@baylibre.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1430391335-7588-1-git-send-email-ahaslam@baylibre.com> References: <1430391335-7588-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, TVD_SUBJ_WIPE_DEBT, T_RP_MATCHES_RCVD, 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 | 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 86f0c46..fa863c7 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -1510,21 +1510,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 581ae08..0248207 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -73,9 +73,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;