From patchwork Wed Apr 29 19:10:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Haslam X-Patchwork-Id: 6297891 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 29B05BEEE1 for ; Wed, 29 Apr 2015 19:11:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4ACD720172 for ; Wed, 29 Apr 2015 19:11:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 591932017D for ; Wed, 29 Apr 2015 19:11:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751542AbbD2TL0 (ORCPT ); Wed, 29 Apr 2015 15:11:26 -0400 Received: from mail-wg0-f50.google.com ([74.125.82.50]:35360 "EHLO mail-wg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751564AbbD2TL0 (ORCPT ); Wed, 29 Apr 2015 15:11:26 -0400 Received: by wgyo15 with SMTP id o15so38938220wgy.2 for ; Wed, 29 Apr 2015 12:11:24 -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=he0e9SUKtKO1yLmdsIYNoKUHv+nT92YcgKL5fmxAxp4=; b=SGCYi8TDrDGngNkw8OLm7htL0kFCG8PnMZz4+C0F2kCxWouOekgm126XIwfmQaMhaD j1l9KXycE2yUG4SMtvXFQruxJ83n/PMD0JROEB5+f5ZqSRY1RfpN/os/O/TnxQnjKx/w wL2aXuuEshyCEoK/+eX1CmN0XcfqwjFPIv1XAVO/3MJhCdLEGYUnWswKDgeTfrrrs1qU po7vdAy/eK86PWkPcozCrDdLL/WHhkuAAICfsfxzHgShDMB8P1sWWTS+yPZ8PSQxuTp+ +GLNgEDvALrlKwsjKj83y6rZbkNJwSfYhmGW4vofpIDfV5ZG6NBZfuepY+2+OuEp7gUj 7X7g== X-Gm-Message-State: ALoCoQlLOqbqyG/V0vE3zjuK+kXzgd97xUq6wLoZRpexvyQruemBkdsaJ09DY/IwGyK5u3w+kMoj X-Received: by 10.180.96.138 with SMTP id ds10mr40755825wib.95.1430334684740; Wed, 29 Apr 2015 12:11:24 -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 be3sm418738wib.21.2015.04.29.12.11.22 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 29 Apr 2015 12:11:23 -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/RFC v6 5/5] PM / Domains: remove old power on/off callbacks. Date: Wed, 29 Apr 2015 21:10:15 +0200 Message-Id: <1430334615-1161-6-git-send-email-ahaslam@baylibre.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1430334615-1161-1-git-send-email-ahaslam@baylibre.com> References: <1430334615-1161-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 the state version of the callbacks, we can remove the default callbacks without breaking compilation. 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 4ea1365..30bff3f 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 - * platfroms that are not converted to use the multiple states. - * This will be removed once all platfroms are converted to use - * multiple states. note that non converted platfroms 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 8a3d43f..935984f 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;