* [PATCH] i2c: busses: i2c-ocores: Fix PM-related warning
@ 2013-02-26 21:53 maxin.john
2013-03-04 9:18 ` Maxin B. John
0 siblings, 1 reply; 3+ messages in thread
From: maxin.john @ 2013-02-26 21:53 UTC (permalink / raw)
To: jacmet
Cc: wsa, ben-linux, grant.likely, rob.herring, linux-i2c,
linux-kernel, devicetree-discuss, Maxin B. John
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] i2c: busses: i2c-ocores: Fix PM-related warning
2013-02-26 21:53 [PATCH] i2c: busses: i2c-ocores: Fix PM-related warning maxin.john
@ 2013-03-04 9:18 ` Maxin B. John
2013-03-04 10:01 ` Peter Korsgaard
0 siblings, 1 reply; 3+ messages in thread
From: Maxin B. John @ 2013-03-04 9:18 UTC (permalink / raw)
To: jacmet
Cc: wsa, ben-linux, grant.likely, rob.herring, linux-i2c,
linux-kernel, devicetree-discuss, Maxin B. John
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..
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] i2c: busses: i2c-ocores: Fix PM-related warning
2013-03-04 9:18 ` Maxin B. John
@ 2013-03-04 10:01 ` Peter Korsgaard
0 siblings, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2013-03-04 10:01 UTC (permalink / raw)
To: Maxin B. John
Cc: wsa, ben-linux, grant.likely, rob.herring, linux-i2c,
linux-kernel, devicetree-discuss, Maxin B. John
>>>>> "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..
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-03-04 10:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-26 21:53 [PATCH] i2c: busses: i2c-ocores: Fix PM-related warning maxin.john
2013-03-04 9:18 ` Maxin B. John
2013-03-04 10:01 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox