]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ARM: 7079/1: spi: Fix builderror in spi-pl022.c
authorPeter Hüwe <PeterHuewe@gmx.de>
Mon, 5 Sep 2011 20:07:23 +0000 (21:07 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 22 Sep 2011 15:21:43 +0000 (16:21 +0100)
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>
drivers/spi/spi-pl022.c

index 078338f59481ad5068bae19640721fc0d15aa55e..3520cf955b95c6c3b7e05614e5b3755e8787c0a1 100644 (file)
@@ -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;
 }