From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Cc: arnd@arndb.de
Subject: [PATCH v2 1/2] smiapp: Implement power-on and power-off sequences without runtime PM
Date: Sun, 20 Nov 2016 00:24:25 +0200 [thread overview]
Message-ID: <1479594266-3034-2-git-send-email-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <1479594266-3034-1-git-send-email-sakari.ailus@linux.intel.com>
Power on the sensor when the module is loaded and power it off when it is
removed.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
drivers/media/i2c/smiapp/smiapp-core.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c
index 59872b3..b20886f 100644
--- a/drivers/media/i2c/smiapp/smiapp-core.c
+++ b/drivers/media/i2c/smiapp/smiapp-core.c
@@ -2741,8 +2741,6 @@ static const struct v4l2_subdev_internal_ops smiapp_internal_ops = {
* I2C Driver
*/
-#ifdef CONFIG_PM
-
static int smiapp_suspend(struct device *dev)
{
struct i2c_client *client = to_i2c_client(dev);
@@ -2783,13 +2781,6 @@ static int smiapp_resume(struct device *dev)
return rval;
}
-#else
-
-#define smiapp_suspend NULL
-#define smiapp_resume NULL
-
-#endif /* CONFIG_PM */
-
static struct smiapp_hwconfig *smiapp_get_hwconfig(struct device *dev)
{
struct smiapp_hwconfig *hwcfg;
@@ -2915,7 +2906,10 @@ static int smiapp_probe(struct i2c_client *client,
pm_runtime_enable(&client->dev);
- rval = pm_runtime_get_sync(&client->dev);
+ if (IS_ENABLED(CONFIG_PM))
+ rval = pm_runtime_get_sync(&client->dev);
+ else
+ rval = smiapp_power_on(&client->dev);
if (rval < 0) {
rval = -ENODEV;
goto out_power_off;
@@ -3113,7 +3107,10 @@ static int smiapp_probe(struct i2c_client *client,
smiapp_cleanup(sensor);
out_power_off:
- pm_runtime_put(&client->dev);
+ if (IS_ENABLED(CONFIG_PM))
+ pm_runtime_put(&client->dev);
+ else
+ smiapp_power_off(&client->dev);
pm_runtime_disable(&client->dev);
return rval;
@@ -3127,7 +3124,10 @@ static int smiapp_remove(struct i2c_client *client)
v4l2_async_unregister_subdev(subdev);
- pm_runtime_suspend(&client->dev);
+ if (IS_ENABLED(CONFIG_PM))
+ pm_runtime_suspend(&client->dev);
+ else
+ smiapp_power_off(&client->dev);
pm_runtime_disable(&client->dev);
for (i = 0; i < sensor->ssds_used; i++) {
--
2.1.4
next prev parent reply other threads:[~2016-11-19 22:24 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-19 22:24 [PATCH v2 0/2] smiapp fix for w/o CONFIG_PM, compiler warnings Sakari Ailus
2016-11-19 22:24 ` Sakari Ailus [this message]
2016-11-29 17:28 ` [PATCH v2.1 1/2] smiapp: Implement power-on and power-off sequences without runtime PM Sakari Ailus
2016-11-29 17:35 ` Laurent Pinchart
2016-11-30 11:29 ` Sakari Ailus
2016-11-30 16:11 ` [PATCH v2.2 " Sakari Ailus
2016-11-19 22:24 ` [PATCH v2 2/2] smiapp: Make suspend and resume functions __maybe_unused Sakari Ailus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1479594266-3034-2-git-send-email-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=arnd@arndb.de \
--cc=linux-media@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).