Patchwork [1/1] memory: tegra30: Fix warning w/o PM_SLEEP

login
register
mail settings
Submitter Hiroshi Doyu
Date Nov. 21, 2012, 12:42 p.m.
Message ID <1353501740-25420-1-git-send-email-hdoyu@nvidia.com>
Download mbox | patch
Permalink /patch/200677/
State Not Applicable, archived
Headers show

Comments

Hiroshi Doyu - Nov. 21, 2012, 12:42 p.m.
Fix build warning w/o PM_SLEEP.

Change-Id: I713f7dd697f1ad9fb1fee56b389b0d6c45bb540c

Signed-off-by: Hiroshi Doyu <hdoyu@nvidia.com>
---
 drivers/memory/tegra30-mc.c |    2 ++
 1 file changed, 2 insertions(+)
Stephen Warren - Nov. 26, 2012, 7:33 p.m.
On 11/21/2012 05:42 AM, Hiroshi Doyu wrote:
> Fix build warning w/o PM_SLEEP.

Reviewed-by: Stephen Warren <swarren@nvidia.com>

I assume Greg will take this through his tree.

> Change-Id: I713f7dd697f1ad9fb1fee56b389b0d6c45bb540c

But that shouldn't be there though...
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Greg KH - Nov. 26, 2012, 11:47 p.m.
On Mon, Nov 26, 2012 at 12:33:58PM -0700, Stephen Warren wrote:
> On 11/21/2012 05:42 AM, Hiroshi Doyu wrote:
> > Fix build warning w/o PM_SLEEP.
> 
> Reviewed-by: Stephen Warren <swarren@nvidia.com>
> 
> I assume Greg will take this through his tree.

If so, someone better resend it...

> > Change-Id: I713f7dd697f1ad9fb1fee56b389b0d6c45bb540c
> 
> But that shouldn't be there though...

Agreed, that's not ok.
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/memory/tegra30-mc.c b/drivers/memory/tegra30-mc.c
index 802b9ea..cf10b77 100644
--- a/drivers/memory/tegra30-mc.c
+++ b/drivers/memory/tegra30-mc.c
@@ -267,6 +267,7 @@  static const u32 tegra30_mc_ctx[] = {
 	MC_INTMASK,
 };
 
+#ifdef CONFIG_PM_SLEEP
 static int tegra30_mc_suspend(struct device *dev)
 {
 	int i;
@@ -290,6 +291,7 @@  static int tegra30_mc_resume(struct device *dev)
 	mc_readl(mc, MC_TIMING_CONTROL);
 	return 0;
 }
+#endif
 
 static UNIVERSAL_DEV_PM_OPS(tegra30_mc_pm,
 			    tegra30_mc_suspend,