From patchwork Sun Aug 28 19:26:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Huewe X-Patchwork-Id: 1105912 Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p7SJRKYo029529 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sun, 28 Aug 2011 19:27:42 GMT Received: from localhost ([127.0.0.1] helo=sfs-ml-3.v29.ch3.sourceforge.com) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1Qxl0o-0003lX-96; Sun, 28 Aug 2011 19:27:18 +0000 Received: from sog-mx-2.v43.ch3.sourceforge.com ([172.29.43.192] helo=mx.sourceforge.net) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1Qxl0m-0003lN-AI for spi-devel-general@lists.sourceforge.net; Sun, 28 Aug 2011 19:27:16 +0000 Received-SPF: pass (sog-mx-2.v43.ch3.sourceforge.com: domain of gmx.de designates 213.165.64.23 as permitted sender) client-ip=213.165.64.23; envelope-from=peterhuewe@gmx.de; helo=mailout-de.gmx.net; Received: from mailout-de.gmx.net ([213.165.64.23]) by sog-mx-2.v43.ch3.sourceforge.com with smtp (Exim 4.76) id 1Qxl0j-0005db-8E for spi-devel-general@lists.sourceforge.net; Sun, 28 Aug 2011 19:27:16 +0000 Received: (qmail invoked by alias); 28 Aug 2011 19:27:06 -0000 Received: from dslb-084-056-055-241.pools.arcor-ip.net (EHLO localhost.localdomain) [84.56.55.241] by mail.gmx.net (mp047) with SMTP; 28 Aug 2011 21:27:06 +0200 X-Authenticated: #12255092 X-Provags-ID: V01U2FsdGVkX1//mMNyce//FPs42WS3zOVToU76x/nVIpxwOEqimU pZFSQneRQCyk0k From: Peter Huewe To: Russell King Subject: [PATCH] spi: Fix builderror in spi-pl022.c Date: Sun, 28 Aug 2011 21:26:59 +0200 Message-Id: <1314559619-19923-1-git-send-email-peterhuewe@gmx.de> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: References: X-Y-GMX-Trusted: 0 X-Spam-Score: -1.2 (-) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [213.165.64.23 listed in list.dnswl.org] -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (peterhuewe[at]gmx.de) -0.0 SPF_PASS SPF: sender matches SPF record 0.3 AWL AWL: From: address is in the auto white-list X-Headers-End: 1Qxl0j-0005db-8E Cc: Linus Walleij , linux-kernel@vger.kernel.org, "Rafael J. Wysocki" , spi-devel-general@lists.sourceforge.net, linux-pm@lists.linux-foundation.org, Peter Huewe , linux-arm-kernel@lists.infradead.org X-BeenThere: spi-devel-general@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: Linux SPI core/device drivers discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: spi-devel-general-bounces@lists.sourceforge.net X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sun, 28 Aug 2011 19:27:42 +0000 (UTC) This patch fixes a build error, introduced by commit (67fc8b9f, "PM: add runtime PM support to core Primecell driver") which unfortunately was a little bit incomplete and did contain a typo (11 instead of 22). I'm not sure how this patch could have been tested back then, if it doesn't even compile ;) The build failure was: drivers/spi/spi-pl022.c:2292: error: 'adev' undeclared (first use in this function) drivers/spi/spi-pl022.c:2344: error: 'pl022_suspend' undeclared here (not in a function) The build failure appears e.g. for the u8500 and realview defconfig. LinuxVersion: linux next-20110826 Signed-off-by: Peter Huewe Acked-by: Linus Walleij --- drivers/spi/spi-pl022.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c index 078338f..3520cf9 100644 --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c @@ -2282,14 +2282,14 @@ pl022_remove(struct amba_device *adev) } #ifdef CONFIG_SUSPEND -static int pl011_suspend(struct device *dev) +static int pl022_suspend(struct device *dev) { struct pl022 *pl022 = dev_get_drvdata(dev); int status = 0; status = stop_queue(pl022); if (status) { - dev_warn(&adev->dev, "suspend cannot stop queue\n"); + dev_warn(dev, "suspend cannot stop queue\n"); return status; } @@ -2298,7 +2298,7 @@ static int pl011_suspend(struct device *dev) load_ssp_default_config(pl022); amba_pclk_disable(pl022->adev); amba_vcore_disable(pl022->adev); - dev_dbg(&adev->dev, "suspended\n"); + dev_dbg(dev, "suspended\n"); return 0; }