[PATCH] i2c: tegra: Fix ifdefs for suspend mode

[PATCH] i2c: tegra: Fix ifdefs for suspend mode

[Laxman Dewangan]

CONFIG_PM covers runtime only PM.

Signed-off-by: Laxman Dewangan <ldewangan-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
This patch will remove the compilation warning if CONFIG_PM_SLEEP
is not enabled.

 drivers/i2c/busses/i2c-tegra.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index 66eb53f..9a08c57 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -712,7 +712,7 @@ static int __devexit tegra_i2c_remove(struct platform_device *pdev)
 	return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int tegra_i2c_suspend(struct device *dev)
 {
 	struct tegra_i2c_dev *i2c_dev = dev_get_drvdata(dev);
-- 
1.7.1.1

Re: [PATCH] i2c: tegra: Fix ifdefs for suspend mode

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 1210 bytes --]

On Mon, Jul 30, 2012 at 07:03:07PM +0530, Laxman Dewangan wrote:
> CONFIG_PM covers runtime only PM.

I am a bit confused by this description. CONFIG_PM_RUNTIME covers
runtime PM, no?

> 
> Signed-off-by: Laxman Dewangan <ldewangan-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> ---
> This patch will remove the compilation warning if CONFIG_PM_SLEEP
> is not enabled.

Maybe it would help to see the warning?

> 
>  drivers/i2c/busses/i2c-tegra.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
> index 66eb53f..9a08c57 100644
> --- a/drivers/i2c/busses/i2c-tegra.c
> +++ b/drivers/i2c/busses/i2c-tegra.c
> @@ -712,7 +712,7 @@ static int __devexit tegra_i2c_remove(struct platform_device *pdev)
>  	return 0;
>  }
>  
> -#ifdef CONFIG_PM
> +#ifdef CONFIG_PM_SLEEP
>  static int tegra_i2c_suspend(struct device *dev)
>  {
>  	struct tegra_i2c_dev *i2c_dev = dev_get_drvdata(dev);
> -- 
> 1.7.1.1
> 

Regards,

   Wolfram

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH] i2c: tegra: Fix ifdefs for suspend mode

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 639 bytes --]

On Sat, Aug 18, 2012 at 09:07:32AM +0200, Wolfram Sang wrote:
> On Mon, Jul 30, 2012 at 07:03:07PM +0530, Laxman Dewangan wrote:
> > CONFIG_PM covers runtime only PM.

> I am a bit confused by this description. CONFIG_PM_RUNTIME covers
> runtime PM, no?

The issue is that CONFIG_PM doesn't actually enable any of the PM
callbacks, it only allows you to enable CONFIG_PM_SLEEP and
CONFIG_PM_RUNTIME.  This means that if you use CONFIG_PM to protect your
system sleep callbacks they may end up unreferenced if only runtime PM
is enabled.

Personally I'd rather just uncondtionally enable PM rather than faff
around with all these ifdefs...

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] i2c: tegra: Fix ifdefs for suspend mode

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 885 bytes --]

On Sat, Aug 18, 2012 at 01:01:38PM +0100, Mark Brown wrote:
> On Sat, Aug 18, 2012 at 09:07:32AM +0200, Wolfram Sang wrote:
> > On Mon, Jul 30, 2012 at 07:03:07PM +0530, Laxman Dewangan wrote:
> > > CONFIG_PM covers runtime only PM.
> 
> > I am a bit confused by this description. CONFIG_PM_RUNTIME covers
> > runtime PM, no?
> 
> The issue is that CONFIG_PM doesn't actually enable any of the PM
> callbacks, it only allows you to enable CONFIG_PM_SLEEP and
> CONFIG_PM_RUNTIME.  This means that if you use CONFIG_PM to protect your
> system sleep callbacks they may end up unreferenced if only runtime PM
> is enabled.

Thanks for the explanation!

Laxman, could you update the description to reflect that?

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]