mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
media: ov5670, ov13858: Use pm_runtime_idle
Replace the calls to pm_runtime_get_noresume() and pm_runtime_put() with pm_runtime_idle() in the driver's probe function. This will have the same effect with fewer calls. pm_runtime_disable() in remove is sufficient as the device is already in RPM_SUSPENDED state. Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
parent
361f3803ad
commit
d508fffb92
2 changed files with 2 additions and 18 deletions
|
@ -1735,10 +1735,9 @@ static int ov13858_probe(struct i2c_client *client,
|
|||
* Device is already turned on by i2c-core with ACPI domain PM.
|
||||
* Enable runtime PM and turn off the device.
|
||||
*/
|
||||
pm_runtime_get_noresume(&client->dev);
|
||||
pm_runtime_set_active(&client->dev);
|
||||
pm_runtime_enable(&client->dev);
|
||||
pm_runtime_put(&client->dev);
|
||||
pm_runtime_idle(&client->dev);
|
||||
|
||||
return 0;
|
||||
|
||||
|
@ -1761,14 +1760,7 @@ static int ov13858_remove(struct i2c_client *client)
|
|||
media_entity_cleanup(&sd->entity);
|
||||
ov13858_free_controls(ov13858);
|
||||
|
||||
/*
|
||||
* Disable runtime PM but keep the device turned on.
|
||||
* i2c-core with ACPI domain PM will turn off the device.
|
||||
*/
|
||||
pm_runtime_get_sync(&client->dev);
|
||||
pm_runtime_disable(&client->dev);
|
||||
pm_runtime_set_suspended(&client->dev);
|
||||
pm_runtime_put_noidle(&client->dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -2504,10 +2504,9 @@ static int ov5670_probe(struct i2c_client *client)
|
|||
* Device is already turned on by i2c-core with ACPI domain PM.
|
||||
* Enable runtime PM and turn off the device.
|
||||
*/
|
||||
pm_runtime_get_noresume(&client->dev);
|
||||
pm_runtime_set_active(&client->dev);
|
||||
pm_runtime_enable(&client->dev);
|
||||
pm_runtime_put(&client->dev);
|
||||
pm_runtime_idle(&client->dev);
|
||||
|
||||
return 0;
|
||||
|
||||
|
@ -2536,14 +2535,7 @@ static int ov5670_remove(struct i2c_client *client)
|
|||
v4l2_ctrl_handler_free(sd->ctrl_handler);
|
||||
mutex_destroy(&ov5670->mutex);
|
||||
|
||||
/*
|
||||
* Disable runtime PM but keep the device turned on.
|
||||
* i2c-core with ACPI domain PM will turn off the device.
|
||||
*/
|
||||
pm_runtime_get_sync(&client->dev);
|
||||
pm_runtime_disable(&client->dev);
|
||||
pm_runtime_set_suspended(&client->dev);
|
||||
pm_runtime_put_noidle(&client->dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue