aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2016-07-03 08:01:22 -0400
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-07-12 10:17:19 -0400
commit743eb09f4c96054addb53bda2615ea886343306b (patch)
tree3d1e8ebafd73cd0b74ab788e855fcd69cd61eb75
parent6ddd5453689cf7fddb065097412e025b637d15a9 (diff)
[media] media/i2c: drop the last users of the ctrl core ops
Nobody is using these ops anymore, so remove these callbacks from the subdev drivers that still have them. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Cc: Andy Walls <awalls@md.metrocast.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
-rw-r--r--drivers/media/i2c/cs53l32a.c7
-rw-r--r--drivers/media/i2c/cx25840/cx25840-core.c7
-rw-r--r--drivers/media/i2c/msp3400-driver.c7
-rw-r--r--drivers/media/i2c/saa7115.c7
-rw-r--r--drivers/media/i2c/tvaudio.c7
-rw-r--r--drivers/media/i2c/wm8775.c7
6 files changed, 0 insertions, 42 deletions
diff --git a/drivers/media/i2c/cs53l32a.c b/drivers/media/i2c/cs53l32a.c
index b7e87e38642a..e4b3cf49dd38 100644
--- a/drivers/media/i2c/cs53l32a.c
+++ b/drivers/media/i2c/cs53l32a.c
@@ -121,13 +121,6 @@ static const struct v4l2_ctrl_ops cs53l32a_ctrl_ops = {
121 121
122static const struct v4l2_subdev_core_ops cs53l32a_core_ops = { 122static const struct v4l2_subdev_core_ops cs53l32a_core_ops = {
123 .log_status = cs53l32a_log_status, 123 .log_status = cs53l32a_log_status,
124 .g_ext_ctrls = v4l2_subdev_g_ext_ctrls,
125 .try_ext_ctrls = v4l2_subdev_try_ext_ctrls,
126 .s_ext_ctrls = v4l2_subdev_s_ext_ctrls,
127 .g_ctrl = v4l2_subdev_g_ctrl,
128 .s_ctrl = v4l2_subdev_s_ctrl,
129 .queryctrl = v4l2_subdev_queryctrl,
130 .querymenu = v4l2_subdev_querymenu,
131}; 124};
132 125
133static const struct v4l2_subdev_audio_ops cs53l32a_audio_ops = { 126static const struct v4l2_subdev_audio_ops cs53l32a_audio_ops = {
diff --git a/drivers/media/i2c/cx25840/cx25840-core.c b/drivers/media/i2c/cx25840/cx25840-core.c
index 07a3e7173144..142ae28803bb 100644
--- a/drivers/media/i2c/cx25840/cx25840-core.c
+++ b/drivers/media/i2c/cx25840/cx25840-core.c
@@ -5042,13 +5042,6 @@ static const struct v4l2_ctrl_ops cx25840_ctrl_ops = {
5042 5042
5043static const struct v4l2_subdev_core_ops cx25840_core_ops = { 5043static const struct v4l2_subdev_core_ops cx25840_core_ops = {
5044 .log_status = cx25840_log_status, 5044 .log_status = cx25840_log_status,
5045 .g_ctrl = v4l2_subdev_g_ctrl,
5046 .s_ctrl = v4l2_subdev_s_ctrl,
5047 .s_ext_ctrls = v4l2_subdev_s_ext_ctrls,
5048 .try_ext_ctrls = v4l2_subdev_try_ext_ctrls,
5049 .g_ext_ctrls = v4l2_subdev_g_ext_ctrls,
5050 .queryctrl = v4l2_subdev_queryctrl,
5051 .querymenu = v4l2_subdev_querymenu,
5052 .reset = cx25840_reset, 5045 .reset = cx25840_reset,
5053 .load_fw = cx25840_load_fw, 5046 .load_fw = cx25840_load_fw,
5054 .s_io_pin_config = common_s_io_pin_config, 5047 .s_io_pin_config = common_s_io_pin_config,
diff --git a/drivers/media/i2c/msp3400-driver.c b/drivers/media/i2c/msp3400-driver.c
index e016626ebf89..503b7c4f0a9b 100644
--- a/drivers/media/i2c/msp3400-driver.c
+++ b/drivers/media/i2c/msp3400-driver.c
@@ -642,13 +642,6 @@ static const struct v4l2_ctrl_ops msp_ctrl_ops = {
642 642
643static const struct v4l2_subdev_core_ops msp_core_ops = { 643static const struct v4l2_subdev_core_ops msp_core_ops = {
644 .log_status = msp_log_status, 644 .log_status = msp_log_status,
645 .g_ext_ctrls = v4l2_subdev_g_ext_ctrls,
646 .try_ext_ctrls = v4l2_subdev_try_ext_ctrls,
647 .s_ext_ctrls = v4l2_subdev_s_ext_ctrls,
648 .g_ctrl = v4l2_subdev_g_ctrl,
649 .s_ctrl = v4l2_subdev_s_ctrl,
650 .queryctrl = v4l2_subdev_queryctrl,
651 .querymenu = v4l2_subdev_querymenu,
652}; 645};
653 646
654static const struct v4l2_subdev_video_ops msp_video_ops = { 647static const struct v4l2_subdev_video_ops msp_video_ops = {
diff --git a/drivers/media/i2c/saa7115.c b/drivers/media/i2c/saa7115.c
index bd3526bdd539..58062b41c923 100644
--- a/drivers/media/i2c/saa7115.c
+++ b/drivers/media/i2c/saa7115.c
@@ -1585,13 +1585,6 @@ static const struct v4l2_ctrl_ops saa711x_ctrl_ops = {
1585 1585
1586static const struct v4l2_subdev_core_ops saa711x_core_ops = { 1586static const struct v4l2_subdev_core_ops saa711x_core_ops = {
1587 .log_status = saa711x_log_status, 1587 .log_status = saa711x_log_status,
1588 .g_ext_ctrls = v4l2_subdev_g_ext_ctrls,
1589 .try_ext_ctrls = v4l2_subdev_try_ext_ctrls,
1590 .s_ext_ctrls = v4l2_subdev_s_ext_ctrls,
1591 .g_ctrl = v4l2_subdev_g_ctrl,
1592 .s_ctrl = v4l2_subdev_s_ctrl,
1593 .queryctrl = v4l2_subdev_queryctrl,
1594 .querymenu = v4l2_subdev_querymenu,
1595 .reset = saa711x_reset, 1588 .reset = saa711x_reset,
1596 .s_gpio = saa711x_s_gpio, 1589 .s_gpio = saa711x_s_gpio,
1597#ifdef CONFIG_VIDEO_ADV_DEBUG 1590#ifdef CONFIG_VIDEO_ADV_DEBUG
diff --git a/drivers/media/i2c/tvaudio.c b/drivers/media/i2c/tvaudio.c
index fece2a4339a1..42d1e26e581c 100644
--- a/drivers/media/i2c/tvaudio.c
+++ b/drivers/media/i2c/tvaudio.c
@@ -1855,13 +1855,6 @@ static const struct v4l2_ctrl_ops tvaudio_ctrl_ops = {
1855 1855
1856static const struct v4l2_subdev_core_ops tvaudio_core_ops = { 1856static const struct v4l2_subdev_core_ops tvaudio_core_ops = {
1857 .log_status = tvaudio_log_status, 1857 .log_status = tvaudio_log_status,
1858 .g_ext_ctrls = v4l2_subdev_g_ext_ctrls,
1859 .try_ext_ctrls = v4l2_subdev_try_ext_ctrls,
1860 .s_ext_ctrls = v4l2_subdev_s_ext_ctrls,
1861 .g_ctrl = v4l2_subdev_g_ctrl,
1862 .s_ctrl = v4l2_subdev_s_ctrl,
1863 .queryctrl = v4l2_subdev_queryctrl,
1864 .querymenu = v4l2_subdev_querymenu,
1865}; 1858};
1866 1859
1867static const struct v4l2_subdev_tuner_ops tvaudio_tuner_ops = { 1860static const struct v4l2_subdev_tuner_ops tvaudio_tuner_ops = {
diff --git a/drivers/media/i2c/wm8775.c b/drivers/media/i2c/wm8775.c
index 6e00f145b948..5581f4db02af 100644
--- a/drivers/media/i2c/wm8775.c
+++ b/drivers/media/i2c/wm8775.c
@@ -178,13 +178,6 @@ static const struct v4l2_ctrl_ops wm8775_ctrl_ops = {
178 178
179static const struct v4l2_subdev_core_ops wm8775_core_ops = { 179static const struct v4l2_subdev_core_ops wm8775_core_ops = {
180 .log_status = wm8775_log_status, 180 .log_status = wm8775_log_status,
181 .g_ext_ctrls = v4l2_subdev_g_ext_ctrls,
182 .try_ext_ctrls = v4l2_subdev_try_ext_ctrls,
183 .s_ext_ctrls = v4l2_subdev_s_ext_ctrls,
184 .g_ctrl = v4l2_subdev_g_ctrl,
185 .s_ctrl = v4l2_subdev_s_ctrl,
186 .queryctrl = v4l2_subdev_queryctrl,
187 .querymenu = v4l2_subdev_querymenu,
188}; 181};
189 182
190static const struct v4l2_subdev_tuner_ops wm8775_tuner_ops = { 183static const struct v4l2_subdev_tuner_ops wm8775_tuner_ops = {