[media] media:adv7180: Use dev_pm_ops
Use dev_pm_ops instead of the deprecated legacy suspend/resume callbacks. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Родитель
ead156c427
Коммит
cc1088dc0b
|
@ -614,9 +614,10 @@ static const struct i2c_device_id adv7180_id[] = {
|
|||
{},
|
||||
};
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
static int adv7180_suspend(struct i2c_client *client, pm_message_t state)
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
static int adv7180_suspend(struct device *dev)
|
||||
{
|
||||
struct i2c_client *client = to_i2c_client(dev);
|
||||
int ret;
|
||||
|
||||
ret = i2c_smbus_write_byte_data(client, ADV7180_PWR_MAN_REG,
|
||||
|
@ -626,8 +627,9 @@ static int adv7180_suspend(struct i2c_client *client, pm_message_t state)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int adv7180_resume(struct i2c_client *client)
|
||||
static int adv7180_resume(struct device *dev)
|
||||
{
|
||||
struct i2c_client *client = to_i2c_client(dev);
|
||||
struct v4l2_subdev *sd = i2c_get_clientdata(client);
|
||||
struct adv7180_state *state = to_state(sd);
|
||||
int ret;
|
||||
|
@ -641,6 +643,12 @@ static int adv7180_resume(struct i2c_client *client)
|
|||
return ret;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static SIMPLE_DEV_PM_OPS(adv7180_pm_ops, adv7180_suspend, adv7180_resume);
|
||||
#define ADV7180_PM_OPS (&adv7180_pm_ops)
|
||||
|
||||
#else
|
||||
#define ADV7180_PM_OPS NULL
|
||||
#endif
|
||||
|
||||
MODULE_DEVICE_TABLE(i2c, adv7180_id);
|
||||
|
@ -649,13 +657,10 @@ static struct i2c_driver adv7180_driver = {
|
|||
.driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = KBUILD_MODNAME,
|
||||
.pm = ADV7180_PM_OPS,
|
||||
},
|
||||
.probe = adv7180_probe,
|
||||
.remove = adv7180_remove,
|
||||
#ifdef CONFIG_PM
|
||||
.suspend = adv7180_suspend,
|
||||
.resume = adv7180_resume,
|
||||
#endif
|
||||
.id_table = adv7180_id,
|
||||
};
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче