Fix build warning w/o PM_SLEEP.
Change-Id: I713f7dd697f1ad9fb1fee56b389b0d6c45bb540c
Signed-off-by: Hiroshi Doyu <[email protected]>
---
drivers/memory/tegra30-mc.c | 2 ++
1 file changed, 2 insertions(+)
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,
--
1.7.9.5
>From 2257f87f95c3982aac7c30389357db66f597c083 Mon Sep 17 00:00:00 2001
From: Hiroshi Doyu <[email protected]>
Date: Thu, 15 Nov 2012 08:28:39 +0200
Subject: [PATCH 1/1] memory: tegra30: Fix warning w/o PM_SLEEP
Fix build warning w/o PM_SLEEP.
Signed-off-by: Hiroshi Doyu <[email protected]>
---
drivers/memory/tegra30-mc.c | 2 ++
1 file changed, 2 insertions(+)
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,
--
1.7.9.5
On 11/21/2012 05:47 AM, Hiroshi Doyu wrote:
> From 2257f87f95c3982aac7c30389357db66f597c083 Mon Sep 17 00:00:00 2001
> From: Hiroshi Doyu <[email protected]>
> Date: Thu, 15 Nov 2012 08:28:39 +0200
> Subject: [PATCH 1/1] memory: tegra30: Fix warning w/o PM_SLEEP
>
> Fix build warning w/o PM_SLEEP.
Hiroshi,
I'm getting 2 copies of all these patches; a normal-looking patch
followed by what looks like an mbox file in the message body, or
something like that. Also, the patches are all "to" a mailing list, and
"cc" various people, whereas they should usually be "to" the people you
expect to apply the patch, and "cc" any other people and mailing lists.
I'm off work on holidays right now, returning on the 26th and will look
into which of these patches I should/shouldn't be taking myself when I
get back.
On 11/21/2012 05:42 AM, Hiroshi Doyu wrote:
> Fix build warning w/o PM_SLEEP.
Reviewed-by: Stephen Warren <[email protected]>
I assume Greg will take this through his tree.
> Change-Id: I713f7dd697f1ad9fb1fee56b389b0d6c45bb540c
But that shouldn't be there though...
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 <[email protected]>
>
> 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.
Fix build warning w/o PM_SLEEP.
Signed-off-by: Hiroshi Doyu <[email protected]>
Reviewed-by: Stephen Warren <[email protected]>
---
drivers/memory/tegra30-mc.c | 2 ++
1 file changed, 2 insertions(+)
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,
--
1.7.9.5