From patchwork Mon Nov 3 15:34:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 40032 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 67F9F20560 for ; Mon, 3 Nov 2014 15:35:10 +0000 (UTC) Received: by mail-wi0-f199.google.com with SMTP id r20sf2901952wiv.10 for ; Mon, 03 Nov 2014 07:35:09 -0800 (PST) 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:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=YDBRho9DH828+25mMYQYDbJLVrgI7/jlDrDtsc8WQDI=; b=dzYU7AludYtJIC66E8ylL3TRYO0qS9bTcjCz31lIB4DL3Rc21jjIt5v4HZcaZCXD7l ATC7hODv2mpo+FuKMt4eub8Agx/3W9qIZ5lTwBRJPfgBTox+iaQxH2pV0th5B2Z1xl4H o2fSEy+64bPXG3lWwVN+FMuejv13uSKWhCsk0dE0c7SJ7VdIyDvixvpp+CmPoy5aC3XW QIq5itPJ3piF2wUE91zI8rptaAmxQzNjJVx7G7degpZ9UqOHjNDOAVfa+15uWPfZjMvC rTredkOgNgNEnMZ0GuMpIHZHHLElp0PddfiLGTe/YrlOaLfr2GXT+vgwsAtqfFHiR1AV 6YiQ== X-Gm-Message-State: ALoCoQkx7UIRNxSq2slTyOIdHLidQg8uu+/VzxsvzGna082WJZ4rb/RwQ+KQDqNwJ8cNnrdBQEoQ X-Received: by 10.194.178.163 with SMTP id cz3mr7476821wjc.1.1415028909188; Mon, 03 Nov 2014 07:35:09 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.198.201 with SMTP id je9ls780053lac.92.gmail; Mon, 03 Nov 2014 07:35:09 -0800 (PST) X-Received: by 10.153.7.107 with SMTP id db11mr52091722lad.35.1415028909049; Mon, 03 Nov 2014 07:35:09 -0800 (PST) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com. [209.85.215.50]) by mx.google.com with ESMTPS id w2si19006374law.68.2014.11.03.07.35.07 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 03 Nov 2014 07:35:07 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) client-ip=209.85.215.50; Received: by mail-la0-f50.google.com with SMTP id hz20so7108212lab.23 for ; Mon, 03 Nov 2014 07:35:07 -0800 (PST) X-Received: by 10.152.116.102 with SMTP id jv6mr51920987lab.40.1415028907897; Mon, 03 Nov 2014 07:35:07 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.141.34 with SMTP id rl2csp7263lbb; Mon, 3 Nov 2014 07:35:07 -0800 (PST) X-Received: by 10.66.124.136 with SMTP id mi8mr4636622pab.105.1415028906273; Mon, 03 Nov 2014 07:35:06 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rg2si15508430pbc.127.2014.11.03.07.35.05 for ; Mon, 03 Nov 2014 07:35:06 -0800 (PST) Received-SPF: none (google.com: linux-pm-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752624AbaKCPfE (ORCPT + 12 others); Mon, 3 Nov 2014 10:35:04 -0500 Received: from baptiste.telenet-ops.be ([195.130.132.51]:42082 "EHLO baptiste.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752862AbaKCPfC (ORCPT ); Mon, 3 Nov 2014 10:35:02 -0500 Received: from ayla.of.borg ([84.193.84.167]) by baptiste.telenet-ops.be with bizsmtp id B3aw1p0083cczKo013awP2; Mon, 03 Nov 2014 16:35:00 +0100 Received: from ramsan.of.borg ([192.168.97.29] helo=ramsan) by ayla.of.borg with esmtp (Exim 4.82) (envelope-from ) id 1XlJeh-00036V-VA; Mon, 03 Nov 2014 16:34:56 +0100 Received: from geert by ramsan with local (Exim 4.82) (envelope-from ) id 1XlJeu-0002M8-Bq; Mon, 03 Nov 2014 16:35:08 +0100 From: Geert Uytterhoeven To: "Rafael J. Wysocki" , Simon Horman , Magnus Damm Cc: Ulf Hansson , Kevin Hilman , Grygorii Strashko , Philipp Zabel , Tomasz Figa , linux-sh@vger.kernel.org, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v4 1/9] PM / Domains: Change prototype for the ->attach_dev() callback Date: Mon, 3 Nov 2014 16:34:48 +0100 Message-Id: <1415028896-9005-2-git-send-email-geert+renesas@glider.be> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1415028896-9005-1-git-send-email-geert+renesas@glider.be> References: <1415028896-9005-1-git-send-email-geert+renesas@glider.be> Sender: linux-pm-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: patch@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Ulf Hansson 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 Signed-off-by: Geert Uytterhoeven --- Prerequisite Ulf wrote: 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 73e938b7e9374c68..d44f071988a861ff 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); };