aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx88
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2009-10-05 09:48:17 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-12-05 15:41:03 -0500
commit622b828ab795580903e79acb33fb44f5c9ce7b0f (patch)
tree6bd14a6769bd4caefdb1583c661948041b8a31d3 /drivers/media/video/cx88
parent7ef68e60d9435eb604a346babccb48000b94bc76 (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/cx88')
-rw-r--r--drivers/media/video/cx88/cx88-cards.c2
-rw-r--r--drivers/media/video/cx88/cx88-dvb.c2
-rw-r--r--drivers/media/video/cx88/cx88-video.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 33be6369871a..7330a2d70439 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -3267,7 +3267,7 @@ static void cx88_card_setup(struct cx88_core *core)
3267 ctl.fname); 3267 ctl.fname);
3268 call_all(core, tuner, s_config, &xc2028_cfg); 3268 call_all(core, tuner, s_config, &xc2028_cfg);
3269 } 3269 }
3270 call_all(core, tuner, s_standby); 3270 call_all(core, core, s_power, 0);
3271} 3271}
3272 3272
3273/* ------------------------------------------------------------------ */ 3273/* ------------------------------------------------------------------ */
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index d9e402b25b56..9df71d0244a8 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -1170,7 +1170,7 @@ static int dvb_register(struct cx8802_dev *dev)
1170 fe1->dvb.frontend->ops.ts_bus_ctrl = cx88_dvb_bus_ctrl; 1170 fe1->dvb.frontend->ops.ts_bus_ctrl = cx88_dvb_bus_ctrl;
1171 1171
1172 /* Put the analog decoder in standby to keep it quiet */ 1172 /* Put the analog decoder in standby to keep it quiet */
1173 call_all(core, tuner, s_standby); 1173 call_all(core, core, s_power, 0);
1174 1174
1175 /* register everything */ 1175 /* register everything */
1176 return videobuf_dvb_register_bus(&dev->frontends, THIS_MODULE, dev, 1176 return videobuf_dvb_register_bus(&dev->frontends, THIS_MODULE, dev,
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 57e6b1241090..d7e8fcee559c 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -935,7 +935,7 @@ static int video_release(struct file *file)
935 935
936 mutex_lock(&dev->core->lock); 936 mutex_lock(&dev->core->lock);
937 if(atomic_dec_and_test(&dev->core->users)) 937 if(atomic_dec_and_test(&dev->core->users))
938 call_all(dev->core, tuner, s_standby); 938 call_all(dev->core, core, s_power, 0);
939 mutex_unlock(&dev->core->lock); 939 mutex_unlock(&dev->core->lock);
940 940
941 return 0; 941 return 0;