Doug / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit 6cfa6279edbffa921b7d8c9519bfd83a24ba508e

Authored by Peter Hüwe
Committed by Russell King
1 parent 1c3be369c5
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff

drivers/spi/spi-pl022.c
Diff comments   View file @ 6cfa627
... ... @@ -2282,14 +2282,14 @@
2282 2282 }
2283 2283  
2284 2284 #ifdef CONFIG_SUSPEND
2285   -static int pl011_suspend(struct device *dev)
  2285 +static int pl022_suspend(struct device *dev)
2286 2286 {
2287 2287 struct pl022 *pl022 = dev_get_drvdata(dev);
2288 2288 int status = 0;
2289 2289  
2290 2290 status = stop_queue(pl022);
2291 2291 if (status) {
2292   - dev_warn(&adev->dev, "suspend cannot stop queue\n");
  2292 + dev_warn(dev, "suspend cannot stop queue\n");
2293 2293 return status;
2294 2294 }
2295 2295  
... ... @@ -2298,7 +2298,7 @@
2298 2298 load_ssp_default_config(pl022);
2299 2299 amba_pclk_disable(pl022->adev);
2300 2300 amba_vcore_disable(pl022->adev);
2301   - dev_dbg(&adev->dev, "suspended\n");
  2301 + dev_dbg(dev, "suspended\n");
2302 2302 return 0;
2303 2303 }
2304 2304