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: 5197161 Return-Path: X-Original-To: patchwork-linux-arm@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 AA023C11AC for ; Thu, 30 Oct 2014 12:05:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D072E202F8 for ; Thu, 30 Oct 2014 12:05:38 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 01008202BE for ; Thu, 30 Oct 2014 12:05:38 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XjoRs-00029m-HR; Thu, 30 Oct 2014 12:03:28 +0000 Received: from mail-la0-f43.google.com ([209.85.215.43]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XjoRl-0001u8-5a for linux-arm-kernel@lists.infradead.org; Thu, 30 Oct 2014 12:03:21 +0000 Received: by mail-la0-f43.google.com with SMTP id ge10so4295258lab.16 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=NHYg0f48XVWEV+iw7et9dlAErD4oG2GNl1DSRPg+Owe6lp+T3PRB7/uIpGhjZpgYbx uwbFKKrQOvVlRsGeqMT/1OI4vYaBahxfv4ArBjno3zHyaam8f05mMqgpyueThmlXRmY8 9cZy/or++dAasooFj6x6Zn7AlZMR4gweBOuNF9lwL3B9bdyHRnG/tyr2+G+MnKnnqsK1 /3mAYRbuK4vvLq+4a3qP4/UcBYRNFgTJ85BIftVvp9jiAlar7zU/bSVTLZpRMbHkvW5z zRTWmTuTIzJHGfxEOs0fFLu4gsD9jRpB/KfIEgnhRd+sg34MjUQ8EPShqCCwN3T/iyK1 YUnA== X-Gm-Message-State: ALoCoQlSFzgBJfNr1nGbMyxRyXIoyTTRtrltASOt5/l7J0sGwwRlq8pr9TG4XDXpv9ivYgWN/tMZ 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141030_050321_397020_0E7D9F12 X-CRM114-Status: GOOD ( 13.85 ) X-Spam-Score: -0.7 (/) Cc: Simon Horman , Ulf Hansson , Kevin Hilman , Russell King , Philipp Zabel , Geert Uytterhoeven , Wolfram Sang , Greg Kroah-Hartman , Mark Brown , Dmitry Torokhov , Magnus Damm , Tomasz Figa , linux-samsung-soc@vger.kernel.org, Alan Stern , Ben Dooks , Jinkun Hong , Kukjin Kim , Sylwester Nawrocki , Aaron Lu , Jack Dai , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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); };