diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2009-10-05 09:48:17 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-12-05 15:41:03 -0500 |
commit | 622b828ab795580903e79acb33fb44f5c9ce7b0f (patch) | |
tree | 6bd14a6769bd4caefdb1583c661948041b8a31d3 /drivers/media/video/saa7134 | |
parent | 7ef68e60d9435eb604a346babccb48000b94bc76 (diff) |
V4L/DVB (13238): v4l2_subdev: rename tuner s_standby operation to core s_power
Upcoming I2C v4l2_subdev drivers need a way to control the subdevice
power state from the core. This use case is already partially covered by
the tuner s_standby operation, but no way to explicitly come back from
the standby state is available.
Rename the tuner s_standby operation to core s_power, and fix tuner
drivers accordingly. The tuner core will call s_power(0) instead of
s_standby(). No explicit call to s_power(1) is required for tuners as
they are supposed to wake up from standby automatically.
[mchehab@redhat.com: CodingStyle fix]
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/saa7134')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-core.c | 2 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-video.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c index f87757fccc72..9a5df930885b 100644 --- a/drivers/media/video/saa7134/saa7134-core.c +++ b/drivers/media/video/saa7134/saa7134-core.c | |||
@@ -1032,7 +1032,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, | |||
1032 | saa7134_irq_video_signalchange(dev); | 1032 | saa7134_irq_video_signalchange(dev); |
1033 | 1033 | ||
1034 | if (TUNER_ABSENT != dev->tuner_type) | 1034 | if (TUNER_ABSENT != dev->tuner_type) |
1035 | saa_call_all(dev, tuner, s_standby); | 1035 | saa_call_all(dev, core, s_power, 0); |
1036 | 1036 | ||
1037 | /* register v4l devices */ | 1037 | /* register v4l devices */ |
1038 | if (saa7134_no_overlay > 0) | 1038 | if (saa7134_no_overlay > 0) |
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c index da26f476a302..35f8daa3a359 100644 --- a/drivers/media/video/saa7134/saa7134-video.c +++ b/drivers/media/video/saa7134/saa7134-video.c | |||
@@ -1499,7 +1499,7 @@ static int video_release(struct file *file) | |||
1499 | saa_andorb(SAA7134_OFMT_DATA_A, 0x1f, 0); | 1499 | saa_andorb(SAA7134_OFMT_DATA_A, 0x1f, 0); |
1500 | saa_andorb(SAA7134_OFMT_DATA_B, 0x1f, 0); | 1500 | saa_andorb(SAA7134_OFMT_DATA_B, 0x1f, 0); |
1501 | 1501 | ||
1502 | saa_call_all(dev, tuner, s_standby); | 1502 | saa_call_all(dev, core, s_power, 0); |
1503 | if (fh->radio) | 1503 | if (fh->radio) |
1504 | saa_call_all(dev, core, ioctl, RDS_CMD_CLOSE, &cmd); | 1504 | saa_call_all(dev, core, ioctl, RDS_CMD_CLOSE, &cmd); |
1505 | 1505 | ||