[PATCH 1/5] i2c: stu300: add CONFIG_PM_SLEEP to suspend/resume functions

linux-i2c.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

* [PATCH 1/5] i2c: stu300: add CONFIG_PM_SLEEP to suspend/resume functions
@ 2013-03-26  6:56 Jingoo Han
       [not found] ` <001501ce29ee$fd997150$f8cc53f0$%han-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
  0 siblings, 1 reply; 6+ messages in thread
From: Jingoo Han @ 2013-03-26  6:56 UTC (permalink / raw)
  To: 'Wolfram Sang'
  Cc: 'Wolfram Sang', linux-i2c-u79uwXL29TY76Z2rM5mHXA,
	'Ben Dooks', 'Jingoo Han'

Add CONFIG_PM_SLEEP to suspend/resume functions to fix the following
build warning when CONFIG_PM_SLEEP is not selected. This is because
sleep PM callbacks defined by SIMPLE_DEV_PM_OPS are only used when
the CONFIG_PM_SLEEP is enabled.

drivers/i2c/busses/i2c-stu300.c:941:12: warning: 'stu300_suspend' defined but not used [-Wunused-function]
drivers/i2c/busses/i2c-stu300.c:950:12: warning: 'stu300_resume' defined but not used [-Wunused-function]

Signed-off-by: Jingoo Han <jg1.han-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
---
 drivers/i2c/busses/i2c-stu300.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/i2c/busses/i2c-stu300.c b/drivers/i2c/busses/i2c-stu300.c
index 0a6f941..a17874d 100644
--- a/drivers/i2c/busses/i2c-stu300.c
+++ b/drivers/i2c/busses/i2c-stu300.c
@@ -937,7 +937,7 @@ stu300_probe(struct platform_device *pdev)
 	return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int stu300_suspend(struct device *device)
 {
 	struct stu300_dev *dev = dev_get_drvdata(device);
@@ -960,12 +960,9 @@ static int stu300_resume(struct device *device)
 		dev_err(device, "error re-initializing hardware.\n");
 	return ret;
 }
+#endif
 
 static SIMPLE_DEV_PM_OPS(stu300_pm, stu300_suspend, stu300_resume);
-#define STU300_I2C_PM	(&stu300_pm)
-#else
-#define STU300_I2C_PM	NULL
-#endif
 
 static int __exit
 stu300_remove(struct platform_device *pdev)
@@ -982,7 +979,7 @@ static struct platform_driver stu300_i2c_driver = {
 	.driver = {
 		.name	= NAME,
 		.owner	= THIS_MODULE,
-		.pm	= STU300_I2C_PM,
+		.pm	= &stu300_pm,
 	},
 	.remove		= __exit_p(stu300_remove),
 
-- 
1.7.2.5

^ permalink raw reply related	[flat|nested] 6+ messages in thread

[parent not found: <001501ce29ee$fd997150$f8cc53f0$%han-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>]

* [PATCH 2/5] i2c: pnx: add CONFIG_PM_SLEEP to suspend/resume functions
       [not found] ` <001501ce29ee$fd997150$f8cc53f0$%han-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
@ 2013-03-26  6:56   ` Jingoo Han
  2013-03-26  6:56   ` [PATCH 3/5] i2c: puv3: add CONFIG_PM_SLEEP to suspend function Jingoo Han
                     ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Jingoo Han @ 2013-03-26  6:56 UTC (permalink / raw)
  To: 'Wolfram Sang'
  Cc: 'Wolfram Sang', linux-i2c-u79uwXL29TY76Z2rM5mHXA,
	'Ben Dooks', 'Jingoo Han'

Add CONFIG_PM_SLEEP to suspend/resume functions to fix the following
build warning when CONFIG_PM_SLEEP is not selected. This is because
sleep PM callbacks defined by SIMPLE_DEV_PM_OPS are only used when
the CONFIG_PM_SLEEP is enabled.

drivers/i2c/busses/i2c-pnx.c:599:12: warning: 'i2c_pnx_controller_suspend' defined but not used [-Wunused-function]
drivers/i2c/busses/i2c-pnx.c:608:12: warning: 'i2c_pnx_controller_resume' defined but not used [-Wunused-function]

Signed-off-by: Jingoo Han <jg1.han-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
---
 drivers/i2c/busses/i2c-pnx.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c
index 5f39c6d..af88b722 100644
--- a/drivers/i2c/busses/i2c-pnx.c
+++ b/drivers/i2c/busses/i2c-pnx.c
@@ -595,7 +595,7 @@ static struct i2c_algorithm pnx_algorithm = {
 	.functionality = i2c_pnx_func,
 };
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int i2c_pnx_controller_suspend(struct device *dev)
 {
 	struct i2c_pnx_algo_data *alg_data = dev_get_drvdata(dev);
@@ -611,13 +611,10 @@ static int i2c_pnx_controller_resume(struct device *dev)
 
 	return clk_enable(alg_data->clk);
 }
+#endif
 
 static SIMPLE_DEV_PM_OPS(i2c_pnx_pm,
 			 i2c_pnx_controller_suspend, i2c_pnx_controller_resume);
-#define PNX_I2C_PM	(&i2c_pnx_pm)
-#else
-#define PNX_I2C_PM	NULL
-#endif
 
 static int i2c_pnx_probe(struct platform_device *pdev)
 {
@@ -792,7 +789,7 @@ static struct platform_driver i2c_pnx_driver = {
 		.name = "pnx-i2c",
 		.owner = THIS_MODULE,
 		.of_match_table = of_match_ptr(i2c_pnx_of_match),
-		.pm = PNX_I2C_PM,
+		.pm = &i2c_pnx_pm,
 	},
 	.probe = i2c_pnx_probe,
 	.remove = i2c_pnx_remove,
-- 
1.7.2.5

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 3/5] i2c: puv3: add CONFIG_PM_SLEEP to suspend function
       [not found] ` <001501ce29ee$fd997150$f8cc53f0$%han-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
  2013-03-26  6:56   ` [PATCH 2/5] i2c: pnx: " Jingoo Han
@ 2013-03-26  6:56   ` Jingoo Han
  2013-03-26  6:57   ` [PATCH 4/5] i2c:i2c-bfin-twi: add CONFIG_PM_SLEEP to suspend/resume functions Jingoo Han
                     ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Jingoo Han @ 2013-03-26  6:56 UTC (permalink / raw)
  To: 'Wolfram Sang'
  Cc: 'Wolfram Sang', linux-i2c-u79uwXL29TY76Z2rM5mHXA,
	'Ben Dooks', 'Jingoo Han'

Add CONFIG_PM_SLEEP to suspend function to fix the following build
warning when CONFIG_PM_SLEEP is not selected. This is because
sleep PM callbacks defined by SIMPLE_DEV_PM_OPS are only used when
the CONFIG_PM_SLEEP is enabled.

drivers/i2c/busses/i2c-puv3.c:255:12: warning: 'puv3_i2c_suspend' defined but not used [-Wunused-function]

Signed-off-by: Jingoo Han <jg1.han-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
---
 drivers/i2c/busses/i2c-puv3.c |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/i2c/busses/i2c-puv3.c b/drivers/i2c/busses/i2c-puv3.c
index 8acef65..1a73ce0 100644
--- a/drivers/i2c/busses/i2c-puv3.c
+++ b/drivers/i2c/busses/i2c-puv3.c
@@ -251,7 +251,7 @@ static int puv3_i2c_remove(struct platform_device *pdev)
 	return rc;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int puv3_i2c_suspend(struct device *dev)
 {
 	int poll_count;
@@ -264,13 +264,9 @@ static int puv3_i2c_suspend(struct device *dev)
 
 	return 0;
 }
+#endif
 
 static SIMPLE_DEV_PM_OPS(puv3_i2c_pm, puv3_i2c_suspend, NULL);
-#define PUV3_I2C_PM	(&puv3_i2c_pm)
-
-#else
-#define PUV3_I2C_PM	NULL
-#endif
 
 static struct platform_driver puv3_i2c_driver = {
 	.probe		= puv3_i2c_probe,
@@ -278,7 +274,7 @@ static struct platform_driver puv3_i2c_driver = {
 	.driver		= {
 		.name	= "PKUnity-v3-I2C",
 		.owner	= THIS_MODULE,
-		.pm	= PUV3_I2C_PM,
+		.pm	= &puv3_i2c_pm,
 	}
 };
 
-- 
1.7.2.5

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 4/5] i2c:i2c-bfin-twi: add CONFIG_PM_SLEEP to suspend/resume functions
       [not found] ` <001501ce29ee$fd997150$f8cc53f0$%han-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
  2013-03-26  6:56   ` [PATCH 2/5] i2c: pnx: " Jingoo Han
  2013-03-26  6:56   ` [PATCH 3/5] i2c: puv3: add CONFIG_PM_SLEEP to suspend function Jingoo Han
@ 2013-03-26  6:57   ` Jingoo Han
  2013-03-26  6:57   ` [PATCH 5/5] i2c: mpc: " Jingoo Han
  2013-04-08 17:33   ` [PATCH 1/5] i2c: stu300: " Wolfram Sang
  4 siblings, 0 replies; 6+ messages in thread
From: Jingoo Han @ 2013-03-26  6:57 UTC (permalink / raw)
  To: 'Wolfram Sang'
  Cc: 'Wolfram Sang', linux-i2c-u79uwXL29TY76Z2rM5mHXA,
	'Ben Dooks', 'Jingoo Han'

Add CONFIG_PM_SLEEP to suspend/resume functions to fix the following
build warning when CONFIG_PM_SLEEP is not selected. This is because
sleep PM callbacks defined by SIMPLE_DEV_PM_OPS are only used when
the CONFIG_PM_SLEEP is enabled.

drivers/i2c/busses/i2c-bfin-twi.c:580:12: warning: 'i2c_bfin_twi_suspend' defined but not used [-Wunused-function]
drivers/i2c/busses/i2c-bfin-twi.c:595:12: warning: 'i2c_bfin_twi_resume' defined but not used [-Wunused-function]

Signed-off-by: Jingoo Han <jg1.han-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
---
 drivers/i2c/busses/i2c-bfin-twi.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/i2c/busses/i2c-bfin-twi.c b/drivers/i2c/busses/i2c-bfin-twi.c
index 05080c4..93663c0 100644
--- a/drivers/i2c/busses/i2c-bfin-twi.c
+++ b/drivers/i2c/busses/i2c-bfin-twi.c
@@ -575,6 +575,7 @@ static struct i2c_algorithm bfin_twi_algorithm = {
 	.functionality = bfin_twi_functionality,
 };
 
+#ifdef CONFIG_PM_SLEEP
 static int i2c_bfin_twi_suspend(struct device *dev)
 {
 	struct bfin_twi_iface *iface = dev_get_drvdata(dev);
@@ -609,6 +610,7 @@ static int i2c_bfin_twi_resume(struct device *dev)
 
 	return 0;
 }
+#endif
 
 static SIMPLE_DEV_PM_OPS(i2c_bfin_twi_pm,
 			 i2c_bfin_twi_suspend, i2c_bfin_twi_resume);
-- 
1.7.2.5

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 5/5] i2c: mpc: add CONFIG_PM_SLEEP to suspend/resume functions
       [not found] ` <001501ce29ee$fd997150$f8cc53f0$%han-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
                     ` (2 preceding siblings ...)
  2013-03-26  6:57   ` [PATCH 4/5] i2c:i2c-bfin-twi: add CONFIG_PM_SLEEP to suspend/resume functions Jingoo Han
@ 2013-03-26  6:57   ` Jingoo Han
  2013-04-08 17:33   ` [PATCH 1/5] i2c: stu300: " Wolfram Sang
  4 siblings, 0 replies; 6+ messages in thread
From: Jingoo Han @ 2013-03-26  6:57 UTC (permalink / raw)
  To: 'Wolfram Sang'
  Cc: 'Wolfram Sang', linux-i2c-u79uwXL29TY76Z2rM5mHXA,
	'Ben Dooks', 'Jingoo Han'

Add CONFIG_PM_SLEEP to suspend/resume functions to fix the following
build warning when CONFIG_PM_SLEEP is not selected. This is because
sleep PM callbacks defined by SIMPLE_DEV_PM_OPS are only used when
the CONFIG_PM_SLEEP is enabled.

drivers/i2c/busses/i2c-mpc.c:724:12: warning: 'mpc_i2c_suspend' defined but not used [-Wunused-function]
drivers/i2c/busses/i2c-mpc.c:734:12: warning: 'mpc_i2c_resume' defined but not used [-Wunused-function]

Signed-off-by: Jingoo Han <jg1.han-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
---
 drivers/i2c/busses/i2c-mpc.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index 5e705ee..9c103c2 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -720,7 +720,7 @@ static int fsl_i2c_remove(struct platform_device *op)
 	return 0;
 };
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int mpc_i2c_suspend(struct device *dev)
 {
 	struct mpc_i2c *i2c = dev_get_drvdata(dev);
@@ -740,9 +740,9 @@ static int mpc_i2c_resume(struct device *dev)
 
 	return 0;
 }
+#endif
 
 SIMPLE_DEV_PM_OPS(mpc_i2c_pm_ops, mpc_i2c_suspend, mpc_i2c_resume);
-#endif
 
 static const struct mpc_i2c_data mpc_i2c_data_512x = {
 	.setup = mpc_i2c_setup_512x,
@@ -788,9 +788,7 @@ static struct platform_driver mpc_i2c_driver = {
 		.owner = THIS_MODULE,
 		.name = DRV_NAME,
 		.of_match_table = mpc_i2c_of_match,
-#ifdef CONFIG_PM
 		.pm = &mpc_i2c_pm_ops,
-#endif
 	},
 };
 
-- 
1.7.2.5

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/5] i2c: stu300: add CONFIG_PM_SLEEP to suspend/resume functions
       [not found] ` <001501ce29ee$fd997150$f8cc53f0$%han-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
                     ` (3 preceding siblings ...)
  2013-03-26  6:57   ` [PATCH 5/5] i2c: mpc: " Jingoo Han
@ 2013-04-08 17:33   ` Wolfram Sang
  4 siblings, 0 replies; 6+ messages in thread
From: Wolfram Sang @ 2013-04-08 17:33 UTC (permalink / raw)
  To: Jingoo Han
  Cc: 'Wolfram Sang', linux-i2c-u79uwXL29TY76Z2rM5mHXA,
	'Ben Dooks'

On Tue, Mar 26, 2013 at 03:56:07PM +0900, Jingoo Han wrote:
> Add CONFIG_PM_SLEEP to suspend/resume functions to fix the following
> build warning when CONFIG_PM_SLEEP is not selected. This is because
> sleep PM callbacks defined by SIMPLE_DEV_PM_OPS are only used when
> the CONFIG_PM_SLEEP is enabled.
> 
> drivers/i2c/busses/i2c-stu300.c:941:12: warning: 'stu300_suspend' defined but not used [-Wunused-function]
> drivers/i2c/busses/i2c-stu300.c:950:12: warning: 'stu300_resume' defined but not used [-Wunused-function]
> 
> Signed-off-by: Jingoo Han <jg1.han-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>

My comment from http://patchwork.ozlabs.org/patch/229867/ applies also
to this series.

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2013-04-08 17:33 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-26  6:56 [PATCH 1/5] i2c: stu300: add CONFIG_PM_SLEEP to suspend/resume functions Jingoo Han
     [not found] ` <001501ce29ee$fd997150$f8cc53f0$%han-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
2013-03-26  6:56   ` [PATCH 2/5] i2c: pnx: " Jingoo Han
2013-03-26  6:56   ` [PATCH 3/5] i2c: puv3: add CONFIG_PM_SLEEP to suspend function Jingoo Han
2013-03-26  6:57   ` [PATCH 4/5] i2c:i2c-bfin-twi: add CONFIG_PM_SLEEP to suspend/resume functions Jingoo Han
2013-03-26  6:57   ` [PATCH 5/5] i2c: mpc: " Jingoo Han
2013-04-08 17:33   ` [PATCH 1/5] i2c: stu300: " Wolfram Sang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).