From 776298f47973a0058da7bca4dcc19ee88d3fc16d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20H=C3=BCwe?= <PeterHuewe@gmx.de>
Date: Mon, 5 Sep 2011 21:07:23 +0100
Subject: [PATCH] --- yaml --- r: 269431 b: refs/heads/master c:
 6cfa6279edbffa921b7d8c9519bfd83a24ba508e h: refs/heads/master i:   269429:
 7141cbc301330103e504158a963056e2aea53f0b   269427:
 d7fbd6a467923518f775d91d092c1e557a087445   269423:
 588e1f576cc97b253f1d98df54edf51372529761 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/spi/spi-pl022.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4c694de49693..b696acf3d87c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c3be369c5fcd36c5d3841ca5d97d80ad34e76dd
+refs/heads/master: 6cfa6279edbffa921b7d8c9519bfd83a24ba508e
diff --git a/trunk/drivers/spi/spi-pl022.c b/trunk/drivers/spi/spi-pl022.c
index 078338f59481..3520cf955b95 100644
--- a/trunk/drivers/spi/spi-pl022.c
+++ b/trunk/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;
 }