Skip to content

Commit

Permalink
ARM: 7079/1: spi: Fix builderror in spi-pl022.c
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Peter Hüwe authored and Russell King committed Sep 22, 2011
1 parent 1c3be36 commit 6cfa627
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/spi/spi-pl022.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand Down

0 comments on commit 6cfa627

Please sign in to comment.