aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/em28xx
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/em28xx
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/em28xx')
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c2
-rw-r--r--drivers/media/video/em28xx/em28xx-video.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 6c7cbbc59e1c..1e1937070738 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -2658,7 +2658,7 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
2658 em28xx_init_extension(dev); 2658 em28xx_init_extension(dev);
2659 2659
2660 /* Save some power by putting tuner to sleep */ 2660 /* Save some power by putting tuner to sleep */
2661 v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_standby); 2661 v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_power, 0);
2662 2662
2663 return 0; 2663 return 0;
2664 2664
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 3a1dfb7726f8..fbe536f092f9 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -2225,7 +2225,7 @@ static int em28xx_v4l2_close(struct file *filp)
2225 } 2225 }
2226 2226
2227 /* Save some power by putting tuner to sleep */ 2227 /* Save some power by putting tuner to sleep */
2228 v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_standby); 2228 v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_power, 0);
2229 2229
2230 /* do this before setting alternate! */ 2230 /* do this before setting alternate! */
2231 em28xx_uninit_isoc(dev); 2231 em28xx_uninit_isoc(dev);