From patchwork Thu Oct 30 12:02:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 5197151 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CEE7FC11AC for ; Thu, 30 Oct 2014 12:03:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A762420320 for ; Thu, 30 Oct 2014 12:03:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2943820340 for ; Thu, 30 Oct 2014 12:03:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932774AbaJ3MDA (ORCPT ); Thu, 30 Oct 2014 08:03:00 -0400 Received: from mail-la0-f44.google.com ([209.85.215.44]:56534 "EHLO mail-la0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933039AbaJ3MC7 (ORCPT ); Thu, 30 Oct 2014 08:02:59 -0400 Received: by mail-la0-f44.google.com with SMTP id gf13so4276663lab.17 for ; Thu, 30 Oct 2014 05:02:57 -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; bh=juyQwwmdVAFhcOYr3GBrSWAFs6OX03pUwXia9/dnLL8=; b=R3tldgySJS/SVsptEXmnYGJ2z+iiN2/9UM1zJCn75YndOTA7eQA7t3h1VGGsxTCv8k eJKHw1Lsluo/2U1ZDSPe7pBVxDhAdj3FTG57W08qsxCifmDi3vnKQBQB+k+7y/f8d9DG rjgDH90+AiOqfLjs1+7j8FTgaMhQl0n2MnU8jT+Wvrw89h45Iu2vkTZpin/fvaegwSy0 +usB+03wIeZ3XeYxYqoiEytW13+h+mpHae2q62DFyp9oAhv1v1wBR1DZZCEyBnhf3jjA FP7shBtBp6yiM7iGiQjMa356dFPpfnYxzwRLTM3L8onjU/q66UlQ8WUlmuT5mIf27Q69 gL/Q== X-Gm-Message-State: ALoCoQnoC/jUEJqyCEyPZLXp2jLtL3cqiT2czMgmvcUUW5lQHljU/1/oj29aQBJa26qxuap1pSL7 X-Received: by 10.152.9.129 with SMTP id z1mr8220609laa.14.1414670577297; Thu, 30 Oct 2014 05:02:57 -0700 (PDT) Received: from uffe-Latitude-E6430s.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id r1sm3123004lae.25.2014.10.30.05.02.54 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 30 Oct 2014 05:02:56 -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, linux-samsung-soc@vger.kernel.org, Geert Uytterhoeven , Kevin Hilman , Alan Stern , Greg Kroah-Hartman , Tomasz Figa , Simon Horman , Magnus Damm , Ben Dooks , Kukjin Kim , Philipp Zabel , Mark Brown , Wolfram Sang , Russell King , Dmitry Torokhov , Jack Dai , Jinkun Hong , Aaron Lu , Sylwester Nawrocki , Ulf Hansson Subject: [PATCH] PM / Domains: Change prototype for the ->attach_dev() callback Date: Thu, 30 Oct 2014 13:02:49 +0100 Message-Id: <1414670569-3002-1-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.5 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 Convert the prototype to return and int. This is just an initial step, needed to support error handling. Signed-off-by: Ulf Hansson Acked-by: Geert Uytterhoeven Acked-by: Pavel Machek Acked-by: Kevin Hilman --- This patch is intended as fix for 3.18 rc[n]. Why? There are other SOC specific patches around that adds genpd support and which implements the ->attach_dev() callback. To prevent having an "atomic" patch during the next release cycle, let's change the prototype now instead. Further patches will add the actual error handling in genpd and these can then be reviewed and tested thoroughly. --- include/linux/pm_domain.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index 73e938b..d44f071 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -72,7 +72,7 @@ struct generic_pm_domain { bool max_off_time_changed; bool cached_power_down_ok; struct gpd_cpuidle_data *cpuidle_data; - void (*attach_dev)(struct device *dev); + int (*attach_dev)(struct device *dev); void (*detach_dev)(struct device *dev); };