diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-04-01 02:49:59 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-06 20:44:20 -0400 |
commit | 7c9fc9d50f97c9a6733ff1a22b6e31bcd91778e2 (patch) | |
tree | 12423e911ab794b85f5f2b1148ce5fe8a07103bf /include/media | |
parent | 78a3b4db2e53a1903c86e2856e175d85a3849e84 (diff) |
V4L/DVB (11368): v4l2-subdev: move s_standby from core to tuner.
s_standby is only used to put the tuner in powersaving mode, so move it
from core to tuner.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/v4l2-subdev.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h index 9a8535be1edf..c84ff88c913f 100644 --- a/include/media/v4l2-subdev.h +++ b/include/media/v4l2-subdev.h | |||
@@ -96,14 +96,11 @@ struct v4l2_crystal_freq { | |||
96 | 96 | ||
97 | s_gpio: set GPIO pins. Very simple right now, might need to be extended with | 97 | s_gpio: set GPIO pins. Very simple right now, might need to be extended with |
98 | a direction argument if needed. | 98 | a direction argument if needed. |
99 | |||
100 | s_standby: puts tuner on powersaving state, disabling it, except for i2c. | ||
101 | */ | 99 | */ |
102 | struct v4l2_subdev_core_ops { | 100 | struct v4l2_subdev_core_ops { |
103 | int (*g_chip_ident)(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip); | 101 | int (*g_chip_ident)(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip); |
104 | int (*log_status)(struct v4l2_subdev *sd); | 102 | int (*log_status)(struct v4l2_subdev *sd); |
105 | int (*init)(struct v4l2_subdev *sd, u32 val); | 103 | int (*init)(struct v4l2_subdev *sd, u32 val); |
106 | int (*s_standby)(struct v4l2_subdev *sd, u32 standby); | ||
107 | int (*reset)(struct v4l2_subdev *sd, u32 val); | 104 | int (*reset)(struct v4l2_subdev *sd, u32 val); |
108 | int (*s_gpio)(struct v4l2_subdev *sd, u32 val); | 105 | int (*s_gpio)(struct v4l2_subdev *sd, u32 val); |
109 | int (*queryctrl)(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc); | 106 | int (*queryctrl)(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc); |
@@ -127,6 +124,8 @@ struct v4l2_subdev_core_ops { | |||
127 | s_type_addr: sets tuner type and its I2C addr. | 124 | s_type_addr: sets tuner type and its I2C addr. |
128 | 125 | ||
129 | s_config: sets tda9887 specific stuff, like port1, port2 and qss | 126 | s_config: sets tda9887 specific stuff, like port1, port2 and qss |
127 | |||
128 | s_standby: puts tuner on powersaving state, disabling it, except for i2c. | ||
130 | */ | 129 | */ |
131 | struct v4l2_subdev_tuner_ops { | 130 | struct v4l2_subdev_tuner_ops { |
132 | int (*s_mode)(struct v4l2_subdev *sd, enum v4l2_tuner_type); | 131 | int (*s_mode)(struct v4l2_subdev *sd, enum v4l2_tuner_type); |
@@ -138,6 +137,7 @@ struct v4l2_subdev_tuner_ops { | |||
138 | int (*s_std)(struct v4l2_subdev *sd, v4l2_std_id norm); | 137 | int (*s_std)(struct v4l2_subdev *sd, v4l2_std_id norm); |
139 | int (*s_type_addr)(struct v4l2_subdev *sd, struct tuner_setup *type); | 138 | int (*s_type_addr)(struct v4l2_subdev *sd, struct tuner_setup *type); |
140 | int (*s_config)(struct v4l2_subdev *sd, const struct v4l2_priv_tun_config *config); | 139 | int (*s_config)(struct v4l2_subdev *sd, const struct v4l2_priv_tun_config *config); |
140 | int (*s_standby)(struct v4l2_subdev *sd); | ||
141 | }; | 141 | }; |
142 | 142 | ||
143 | /* s_clock_freq: set the frequency (in Hz) of the audio clock output. | 143 | /* s_clock_freq: set the frequency (in Hz) of the audio clock output. |