From patchwork Fri Apr 11 15:26:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 3970111 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 071D89F336 for ; Fri, 11 Apr 2014 15:26:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1CE1320783 for ; Fri, 11 Apr 2014 15:26:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8CE71207F3 for ; Fri, 11 Apr 2014 15:26:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758904AbaDKP0x (ORCPT ); Fri, 11 Apr 2014 11:26:53 -0400 Received: from mail-lb0-f169.google.com ([209.85.217.169]:51746 "EHLO mail-lb0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758686AbaDKP0w (ORCPT ); Fri, 11 Apr 2014 11:26:52 -0400 Received: by mail-lb0-f169.google.com with SMTP id q8so3733151lbi.28 for ; Fri, 11 Apr 2014 08:26:51 -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=bdaeZ8hiOQSSQrlF+7jyuRtLWeOKLo9tS4DW/RoI2zA=; b=h4YhuoxWQKbSQUPu8Vwn6RlT4IhkLcbihp/WQZVYgpVSqgJQfZPr8F6q7oOYQK9/js byqQv0Enu2UZIOUq9EXUpibXsKcHOs7sqqUdk9SMuLvgjMi38Qy+iPoJX5sYR8uQnJ/q v30tfAWuJug0x901RofVOt6hw1Wz93xtGPYsTJ1myV3An2dnQl+Yp3oP+Np2DFywC8Xd a3Cei5QTLcr/FZ6zaBw4f4UCsYVssIzVKm1i6UTy0P2w9DJMnsbvshQVHnZ4nISIEUBb 8eS/qQdHscQORUR/weNcewHzF22JeXIg3e+v6HVHlI+8COITyOYr8jHOkoeWHWKhpYp7 pYXw== X-Gm-Message-State: ALoCoQn+hjvIRQ9OKV/pENyf2hFsR01mLTgUoRCJ54T6mpdbJiOfBJ/nxY78xgIGhZ5ETXDys/4J X-Received: by 10.112.89.234 with SMTP id br10mr1401650lbb.60.1397230010975; Fri, 11 Apr 2014 08:26:50 -0700 (PDT) Received: from linaro-ulf.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id q4sm6279868lbh.20.2014.04.11.08.26.48 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Apr 2014 08:26:50 -0700 (PDT) From: Ulf Hansson To: "Rafael J. Wysocki" , Len Brown , Pavel Machek , linux-pm@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Kevin Hilman , Alan Stern , Greg Kroah-Hartman , Tomasz Figa , Daniel Lezcano , Ulf Hansson , Simon Horman , Magnus Damm Subject: [PATCH 1/4] ARM: shmobile: Ignore callbacks for subsys generic_pm_domain_data Date: Fri, 11 Apr 2014 17:26:41 +0200 Message-Id: <1397230004-22306-2-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1397230004-22306-1-git-send-email-ulf.hansson@linaro.org> References: <1397230004-22306-1-git-send-email-ulf.hansson@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 There are no active users of these callbacks, thus there are no benefit of trying to invoke them. Cc: Simon Horman Cc: Magnus Damm Signed-off-by: Ulf Hansson Acked-by: Simon Horman --- I am seeking ack from the SOC maintainers since this needs to go with the other patches in this patchset on the PM core. --- arch/arm/mach-shmobile/pm-rmobile.c | 38 +++-------------------------------- 1 file changed, 3 insertions(+), 35 deletions(-) diff --git a/arch/arm/mach-shmobile/pm-rmobile.c b/arch/arm/mach-shmobile/pm-rmobile.c index 1fc05d9..f710235 100644 --- a/arch/arm/mach-shmobile/pm-rmobile.c +++ b/arch/arm/mach-shmobile/pm-rmobile.c @@ -99,39 +99,7 @@ static int rmobile_pd_power_up(struct generic_pm_domain *genpd) static bool rmobile_pd_active_wakeup(struct device *dev) { - bool (*active_wakeup)(struct device *dev); - - active_wakeup = dev_gpd_data(dev)->ops.active_wakeup; - return active_wakeup ? active_wakeup(dev) : true; -} - -static int rmobile_pd_stop_dev(struct device *dev) -{ - int (*stop)(struct device *dev); - - stop = dev_gpd_data(dev)->ops.stop; - if (stop) { - int ret = stop(dev); - if (ret) - return ret; - } - return pm_clk_suspend(dev); -} - -static int rmobile_pd_start_dev(struct device *dev) -{ - int (*start)(struct device *dev); - int ret; - - ret = pm_clk_resume(dev); - if (ret) - return ret; - - start = dev_gpd_data(dev)->ops.start; - if (start) - ret = start(dev); - - return ret; + return true; } static void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd) @@ -140,8 +108,8 @@ static void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd) struct dev_power_governor *gov = rmobile_pd->gov; pm_genpd_init(genpd, gov ? : &simple_qos_governor, false); - genpd->dev_ops.stop = rmobile_pd_stop_dev; - genpd->dev_ops.start = rmobile_pd_start_dev; + genpd->dev_ops.stop = pm_clk_suspend; + genpd->dev_ops.start = pm_clk_resume; genpd->dev_ops.active_wakeup = rmobile_pd_active_wakeup; genpd->dev_irq_safe = true; genpd->power_off = rmobile_pd_power_down;