[PATCH -v2] fbdev: sh_mobile_meram: Fix defined but not used compiler warnings

If both CONFIG_PM_SLEEP and CONFIG_PM_RUNTIME are not set:

drivers/video/sh_mobile_meram.c:573: warning: ‘sh_mobile_meram_suspend’ defined but not used
drivers/video/sh_mobile_meram.c:597: warning: ‘sh_mobile_meram_resume’ defined but not used

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
v2: Both functions are used if CONFIG_PM_SLEEP || CONFIG_PM_RUNTIME,
    as pointed out by Laurent

 drivers/video/sh_mobile_meram.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/video/sh_mobile_meram.c b/drivers/video/sh_mobile_meram.c
index e0f098562a74..a297de5cc859 100644
--- a/drivers/video/sh_mobile_meram.c
+++ b/drivers/video/sh_mobile_meram.c

@@ -569,6 +569,7 @@ EXPORT_SYMBOL_GPL(sh_mobile_meram_cache_update);
  * Power management
  */
 
+#if defined(CONFIG_PM_SLEEP) || defined(CONFIG_PM_RUNTIME)
 static int sh_mobile_meram_suspend(struct device *dev)
 {
 	struct platform_device *pdev = to_platform_device(dev);

@@ -611,6 +612,7 @@ static int sh_mobile_meram_resume(struct device *dev)
 		meram_write_reg(priv->base, common_regs[i], priv->regs[i]);
 	return 0;
 }
+#endif /* CONFIG_PM_SLEEP || CONFIG_PM_RUNTIME */
 
 static UNIVERSAL_DEV_PM_OPS(sh_mobile_meram_dev_pm_ops,
 			    sh_mobile_meram_suspend,

-- 
1.7.9.5

Hi Geert,

Thank you for the patch.

On Wednesday 06 November 2013 09:57:27 Geert Uytterhoeven wrote:

If both CONFIG_PM_SLEEP and CONFIG_PM_RUNTIME are not set:

drivers/video/sh_mobile_meram.c:573: warning: ‘sh_mobile_meram_suspend’
defined but not used drivers/video/sh_mobile_meram.c:597: warning:
‘sh_mobile_meram_resume’ defined but not used

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

and applied to my tree.

-- 
Regards,

Laurent Pinchart

Hi Laurent,

On 2013-11-06 13:57, Laurent Pinchart wrote:

Hi Geert,

Thank you for the patch.

On Wednesday 06 November 2013 09:57:27 Geert Uytterhoeven wrote:

quoted

If both CONFIG_PM_SLEEP and CONFIG_PM_RUNTIME are not set:

drivers/video/sh_mobile_meram.c:573: warning: ‘sh_mobile_meram_suspend’
defined but not used drivers/video/sh_mobile_meram.c:597: warning:
‘sh_mobile_meram_resume’ defined but not used

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

and applied to my tree.

What does that mean? Are you collecting sh_mobile video patches?

Or to rephrase, shall I apply this to fbdev fixes tree?

 Tomi

Hi Tomi,

On Tuesday 26 November 2013 16:44:09 Tomi Valkeinen wrote:

On 2013-11-06 13:57, Laurent Pinchart wrote:

quoted

On Wednesday 06 November 2013 09:57:27 Geert Uytterhoeven wrote:

quoted

If both CONFIG_PM_SLEEP and CONFIG_PM_RUNTIME are not set:

drivers/video/sh_mobile_meram.c:573: warning: ‘sh_mobile_meram_suspend’
defined but not used drivers/video/sh_mobile_meram.c:597: warning:
‘sh_mobile_meram_resume’ defined but not used

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

and applied to my tree.

What does that mean? Are you collecting sh_mobile video patches?

Or to rephrase, shall I apply this to fbdev fixes tree?

I was planning to send you a pull request for that, but if you can pick it up 
that's even easier, thanks.

-- 
Regards,

Laurent Pinchart

On 2013-11-26 16:58, Laurent Pinchart wrote:

Hi Tomi,

On Tuesday 26 November 2013 16:44:09 Tomi Valkeinen wrote:

quoted

On 2013-11-06 13:57, Laurent Pinchart wrote:

quoted

On Wednesday 06 November 2013 09:57:27 Geert Uytterhoeven wrote:

quoted

If both CONFIG_PM_SLEEP and CONFIG_PM_RUNTIME are not set:

drivers/video/sh_mobile_meram.c:573: warning: ‘sh_mobile_meram_suspend’
defined but not used drivers/video/sh_mobile_meram.c:597: warning:
‘sh_mobile_meram_resume’ defined but not used

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

and applied to my tree.

What does that mean? Are you collecting sh_mobile video patches?

Or to rephrase, shall I apply this to fbdev fixes tree?

I was planning to send you a pull request for that, but if you can pick it up 
that's even easier, thanks.

Ok. Applied, then, to fbdev =).

 Tomi