Patchwork i2c: busses: i2c-ocores: Fix PM-related warning

login
register
mail settings
Submitter Maxin B John
Date Feb. 26, 2013, 9:53 p.m.
Message ID <1361915625-24294-1-git-send-email-maxin.john@gmail.com>
Download mbox | patch
Permalink /patch/223414/
State Superseded
Headers show

Comments

Maxin B John - Feb. 26, 2013, 9:53 p.m.
From: "Maxin B. John" <maxin.john@enea.com>

Fixes this warning:
  CC      drivers/i2c/busses/i2c-ocores.o
drivers/i2c/busses/i2c-ocores.c:460:12: warning: 'ocores_i2c_suspend'
 defined but not used [-Wunused-function]
drivers/i2c/busses/i2c-ocores.c:471:12: warning: 'ocores_i2c_resume'
defined but not used [-Wunused-function]

Signed-off-by: Maxin B. John <maxin.john@enea.com>
---
 drivers/i2c/busses/i2c-ocores.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)
Maxin B John - March 4, 2013, 9:18 a.m.
On Tue, Feb 26, 2013 at 10:53 PM,  <maxin.john@gmail.com> wrote:
> From: "Maxin B. John" <maxin.john@enea.com>
>
> Fixes this warning:
>   CC      drivers/i2c/busses/i2c-ocores.o
> drivers/i2c/busses/i2c-ocores.c:460:12: warning: 'ocores_i2c_suspend'
>  defined but not used [-Wunused-function]
> drivers/i2c/busses/i2c-ocores.c:471:12: warning: 'ocores_i2c_resume'
> defined but not used [-Wunused-function]
>
> Signed-off-by: Maxin B. John <maxin.john@enea.com>
> ---
>  drivers/i2c/busses/i2c-ocores.c |    9 +++------
>  1 files changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c
> index 0e1f824..1ecea5e 100644
> --- a/drivers/i2c/busses/i2c-ocores.c
> +++ b/drivers/i2c/busses/i2c-ocores.c
> @@ -456,7 +456,7 @@ static int ocores_i2c_remove(struct platform_device *pdev)
>         return 0;
>  }
>
> -#ifdef CONFIG_PM
> +#ifdef CONFIG_PM_SLEEP
>  static int ocores_i2c_suspend(struct device *dev)
>  {
>         struct ocores_i2c *i2c = dev_get_drvdata(dev);
> @@ -476,12 +476,9 @@ static int ocores_i2c_resume(struct device *dev)
>
>         return 0;
>  }
> +#endif
>
>  static SIMPLE_DEV_PM_OPS(ocores_i2c_pm, ocores_i2c_suspend, ocores_i2c_resume);
> -#define OCORES_I2C_PM  (&ocores_i2c_pm)
> -#else
> -#define OCORES_I2C_PM  NULL
> -#endif
>
>  static struct platform_driver ocores_i2c_driver = {
>         .probe   = ocores_i2c_probe,
> @@ -490,7 +487,7 @@ static struct platform_driver ocores_i2c_driver = {
>                 .owner = THIS_MODULE,
>                 .name = "ocores-i2c",
>                 .of_match_table = ocores_i2c_match,
> -               .pm = OCORES_I2C_PM,
> +               .pm = &ocores_i2c_pm,
>         },
>  };
>
> --
> 1.7.7
>

ping..
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Peter Korsgaard - March 4, 2013, 10:01 a.m.
>>>>> "Maxin" == Maxin B John <maxin.john@gmail.com> writes:

 Maxin> On Tue, Feb 26, 2013 at 10:53 PM,  <maxin.john@gmail.com> wrote:
 >> From: "Maxin B. John" <maxin.john@enea.com>
 >> 
 >> Fixes this warning:
 >> CC      drivers/i2c/busses/i2c-ocores.o
 >> drivers/i2c/busses/i2c-ocores.c:460:12: warning: 'ocores_i2c_suspend'
 >> defined but not used [-Wunused-function]
 >> drivers/i2c/busses/i2c-ocores.c:471:12: warning: 'ocores_i2c_resume'
 >> defined but not used [-Wunused-function]
 >> 
 >> Signed-off-by: Maxin B. John <maxin.john@enea.com>
 >> ---
 >> drivers/i2c/busses/i2c-ocores.c |    9 +++------
 >> 1 files changed, 3 insertions(+), 6 deletions(-)
 >> 
 >> diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c
 >> index 0e1f824..1ecea5e 100644
 >> --- a/drivers/i2c/busses/i2c-ocores.c
 >> +++ b/drivers/i2c/busses/i2c-ocores.c
 >> @@ -456,7 +456,7 @@ static int ocores_i2c_remove(struct platform_device *pdev)
 >> return 0;
 >> }
 >> 
 >> -#ifdef CONFIG_PM
 >> +#ifdef CONFIG_PM_SLEEP
 >> static int ocores_i2c_suspend(struct device *dev)
 >> {
 >> struct ocores_i2c *i2c = dev_get_drvdata(dev);
 >> @@ -476,12 +476,9 @@ static int ocores_i2c_resume(struct device *dev)
 >> 
 >> return 0;
 >> }
 >> +#endif
 >> 
 >> static SIMPLE_DEV_PM_OPS(ocores_i2c_pm, ocores_i2c_suspend,
 >> ocores_i2c_resume);

A comment explaining that the suspend/resume callbacks are unused in the
!PM_SLEEP mode would be good.

With this change we waste ~100 bytes on a dummy dev_pm_ops structure,
but OK.


 >> -#define OCORES_I2C_PM  (&ocores_i2c_pm)
 >> -#else
 >> -#define OCORES_I2C_PM  NULL
 >> -#endif
 >> 
 >> static struct platform_driver ocores_i2c_driver = {
 >> .probe   = ocores_i2c_probe,
 >> @@ -490,7 +487,7 @@ static struct platform_driver ocores_i2c_driver = {
 >> .owner = THIS_MODULE,
 >> .name = "ocores-i2c",
 >> .of_match_table = ocores_i2c_match,
 >> -               .pm = OCORES_I2C_PM,
 >> +               .pm = &ocores_i2c_pm,
 >> },
 >> };
 >> 
 >> --
 >> 1.7.7
 >> 

 Maxin> ping..

Patch

diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c
index 0e1f824..1ecea5e 100644
--- a/drivers/i2c/busses/i2c-ocores.c
+++ b/drivers/i2c/busses/i2c-ocores.c
@@ -456,7 +456,7 @@  static int ocores_i2c_remove(struct platform_device *pdev)
 	return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int ocores_i2c_suspend(struct device *dev)
 {
 	struct ocores_i2c *i2c = dev_get_drvdata(dev);
@@ -476,12 +476,9 @@  static int ocores_i2c_resume(struct device *dev)
 
 	return 0;
 }
+#endif
 
 static SIMPLE_DEV_PM_OPS(ocores_i2c_pm, ocores_i2c_suspend, ocores_i2c_resume);
-#define OCORES_I2C_PM	(&ocores_i2c_pm)
-#else
-#define OCORES_I2C_PM	NULL
-#endif
 
 static struct platform_driver ocores_i2c_driver = {
 	.probe   = ocores_i2c_probe,
@@ -490,7 +487,7 @@  static struct platform_driver ocores_i2c_driver = {
 		.owner = THIS_MODULE,
 		.name = "ocores-i2c",
 		.of_match_table = ocores_i2c_match,
-		.pm = OCORES_I2C_PM,
+		.pm = &ocores_i2c_pm,
 	},
 };