summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Hüwe <PeterHuewe@gmx.de>2011-09-05 21:07:23 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-09-22 16:21:43 +0100
commit6cfa6279edbffa921b7d8c9519bfd83a24ba508e (patch)
treeb950b73d734a2b4926ff4aaebbe6d6ddb0981d82
parent1c3be369c5fcd36c5d3841ca5d97d80ad34e76dd (diff)
downloadop-kernel-dev-6cfa6279edbffa921b7d8c9519bfd83a24ba508e.zip
op-kernel-dev-6cfa6279edbffa921b7d8c9519bfd83a24ba508e.tar.gz
ARM: 7079/1: spi: Fix builderror in spi-pl022.c
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. Signed-off-by: Peter Huewe <peterhuewe@gmx.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--drivers/spi/spi-pl022.c6
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;
}
OpenPOWER on IntegriCloud