| Message ID | 1314559619-19923-1-git-send-email-peterhuewe@gmx.de (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
On Sun, Aug 28, 2011 at 09:26:59PM +0200, Peter Huewe wrote: > 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 ;) Maybe it was tested on configs without CONFIG_SUSPEND enabled - which is highly likely since my ARM development boards don't support S2RAM. That's the problem with ifdef'ing code. It makes it impossible to ensure that it's properly tested. ------------------------------------------------------------------------------ EMC VNX: the world's simplest storage, starting under $10K The only unified storage solution that offers unified management Up to 160% more powerful than alternatives and 25% more efficient. Guaranteed. http://p.sf.net/sfu/emc-vnx-dev2dev
On Sun, Aug 28, 2011 at 9:26 PM, Peter Huewe <peterhuewe@gmx.de> wrote: > 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. > > LinuxVersion: linux next-20110826 > > Signed-off-by: Peter Huewe <peterhuewe@gmx.de> Acked-by: Linus Walleij <linus.walleij@linaro.org> Thanks! Linus Walleij ------------------------------------------------------------------------------ EMC VNX: the world's simplest storage, starting under $10K The only unified storage solution that offers unified management Up to 160% more powerful than alternatives and 25% more efficient. Guaranteed. http://p.sf.net/sfu/emc-vnx-dev2dev
On Sun, Aug 28, 2011 at 9:26 PM, Peter Huewe <peterhuewe@gmx.de> wrote: > 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 ;) Grant can you please apply this patch? Right now linux-next is breaking because of this missing patch... Thanks, Linus Walleij ------------------------------------------------------------------------------ Special Offer -- Download ArcSight Logger for FREE! Finally, a world-class log management solution at an even better price-free! And you'll get a free "Love Thy Logs" t-shirt when you download Logger. Secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsisghtdev2dev
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; }
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. LinuxVersion: linux next-20110826 Signed-off-by: Peter Huewe <peterhuewe@gmx.de> --- drivers/spi/spi-pl022.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)