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: 28282 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f200.google.com (mail-pd0-f200.google.com [209.85.192.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 80B2D2100C for ; Fri, 11 Apr 2014 15:26:53 +0000 (UTC) Received: by mail-pd0-f200.google.com with SMTP id p10sf16656776pdj.3 for ; Fri, 11 Apr 2014 08:26:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=bdaeZ8hiOQSSQrlF+7jyuRtLWeOKLo9tS4DW/RoI2zA=; b=g0FbwAyu4W4ZFpYvVdmjWv3QJDHLf9Ole4akPevQwvkJXlm4qCYpW2gN57pNivdDRB ThbSuuGJJC8whKy5VqxpCfrBYHUG93CB0C/HTebNK8pLrIfvbF5e5MqnYzbAZqOvxtfp NusvMKKwXHrO83jqDOluOReVuJzGFeE9PML+V+EzAdx2CGm7Sn6NBDEl8fAF2DcGLk+e xkQb8npHAe9z/UTNtXal3ORuRkh5C5SHJztOkpqHGT4pUkj/En6+P/kzEaF8YeYPjDeo zcXaNhhphUQ0rsF71SyG0y1lOezzcl+/ch2HeUsd2ecmoELdAY9dZvJd9m2VApcMRofo wsgQ== X-Gm-Message-State: ALoCoQnBWBGs8A3JSsGGssr1JP5m2/4iKYg0fe79JEFnjOKnYKZuSYhkRS2jQWlCObmIB94GOLn6 X-Received: by 10.69.29.33 with SMTP id jt1mr11642213pbd.7.1397230012783; Fri, 11 Apr 2014 08:26:52 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.50.81 with SMTP id r75ls1616144qga.71.gmail; Fri, 11 Apr 2014 08:26:52 -0700 (PDT) X-Received: by 10.220.166.211 with SMTP id n19mr365165vcy.69.1397230012622; Fri, 11 Apr 2014 08:26:52 -0700 (PDT) Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by mx.google.com with ESMTPS id z3si1340535vcx.88.2014.04.11.08.26.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Apr 2014 08:26:52 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.174; Received: by mail-ve0-f174.google.com with SMTP id oz11so4949691veb.33 for ; Fri, 11 Apr 2014 08:26:52 -0700 (PDT) X-Received: by 10.220.5.129 with SMTP id 1mr359996vcv.71.1397230012544; Fri, 11 Apr 2014 08:26:52 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp65200vcb; Fri, 11 Apr 2014 08:26:52 -0700 (PDT) X-Received: by 10.153.7.69 with SMTP id da5mr2468227lad.38.1397230011508; Fri, 11 Apr 2014 08:26:51 -0700 (PDT) Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com [209.85.217.169]) by mx.google.com with ESMTPS id zv8si5804671lbb.83.2014.04.11.08.26.51 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Apr 2014 08:26:51 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.217.169 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.217.169; Received: by mail-lb0-f169.google.com with SMTP id q8so3704987lbi.0 for ; Fri, 11 Apr 2014 08:26:51 -0700 (PDT) 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> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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;