Commit 21b48a70 authored by Jean Delvare's avatar Jean Delvare Committed by Mauro Carvalho Chehab

V4L/DVB (5421): Fix suspend/resume in msp3400 and tuner

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 3284b4e0
...@@ -780,18 +780,16 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg) ...@@ -780,18 +780,16 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
return 0; return 0;
} }
static int msp_suspend(struct device * dev, pm_message_t state) static int msp_suspend(struct i2c_client *client, pm_message_t state)
{ {
struct i2c_client *client = container_of(dev, struct i2c_client, dev);
v4l_dbg(1, msp_debug, client, "suspend\n"); v4l_dbg(1, msp_debug, client, "suspend\n");
msp_reset(client); msp_reset(client);
return 0; return 0;
} }
static int msp_resume(struct device * dev) static int msp_resume(struct i2c_client *client)
{ {
struct i2c_client *client = container_of(dev, struct i2c_client, dev);
v4l_dbg(1, msp_debug, client, "resume\n"); v4l_dbg(1, msp_debug, client, "resume\n");
msp_wake_thread(client); msp_wake_thread(client);
...@@ -996,11 +994,11 @@ static struct i2c_driver i2c_driver = { ...@@ -996,11 +994,11 @@ static struct i2c_driver i2c_driver = {
.id = I2C_DRIVERID_MSP3400, .id = I2C_DRIVERID_MSP3400,
.attach_adapter = msp_probe, .attach_adapter = msp_probe,
.detach_client = msp_detach, .detach_client = msp_detach,
.suspend = msp_suspend,
.resume = msp_resume,
.command = msp_command, .command = msp_command,
.driver = { .driver = {
.name = "msp3400", .name = "msp3400",
.suspend = msp_suspend,
.resume = msp_resume,
}, },
}; };
......
...@@ -804,9 +804,8 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) ...@@ -804,9 +804,8 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
return 0; return 0;
} }
static int tuner_suspend(struct device *dev, pm_message_t state) static int tuner_suspend(struct i2c_client *c, pm_message_t state)
{ {
struct i2c_client *c = container_of (dev, struct i2c_client, dev);
struct tuner *t = i2c_get_clientdata (c); struct tuner *t = i2c_get_clientdata (c);
tuner_dbg ("suspend\n"); tuner_dbg ("suspend\n");
...@@ -814,9 +813,8 @@ static int tuner_suspend(struct device *dev, pm_message_t state) ...@@ -814,9 +813,8 @@ static int tuner_suspend(struct device *dev, pm_message_t state)
return 0; return 0;
} }
static int tuner_resume(struct device *dev) static int tuner_resume(struct i2c_client *c)
{ {
struct i2c_client *c = container_of (dev, struct i2c_client, dev);
struct tuner *t = i2c_get_clientdata (c); struct tuner *t = i2c_get_clientdata (c);
tuner_dbg ("resume\n"); tuner_dbg ("resume\n");
...@@ -837,10 +835,10 @@ static struct i2c_driver driver = { ...@@ -837,10 +835,10 @@ static struct i2c_driver driver = {
.attach_adapter = tuner_probe, .attach_adapter = tuner_probe,
.detach_client = tuner_detach, .detach_client = tuner_detach,
.command = tuner_command, .command = tuner_command,
.driver = {
.name = "tuner",
.suspend = tuner_suspend, .suspend = tuner_suspend,
.resume = tuner_resume, .resume = tuner_resume,
.driver = {
.name = "tuner",
}, },
}; };
static struct i2c_client client_template = { static struct i2c_client client_template = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment