V4L/DVB (6416): Split hooks on volume and audio mode and rework their handling

Also convert audio_mode_gpio functions from audio_hook

Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h
index fdd78f8b1dc3..4a02f0a8a467 100644
--- a/drivers/media/video/bt8xx/bttvp.h
+++ b/drivers/media/video/bt8xx/bttvp.h
@@ -336,9 +336,10 @@ struct bttv {
         /* old gpio interface */
         wait_queue_head_t gpioq;
         int shutdown;
-#ifdef CONFIG_VIDEO_V4L1
-        void (*audio_hook)(struct bttv *btv, struct video_audio *v, int set);
-#endif
+
+        void (*volume_gpio)(struct bttv *btv, __u16 volume);
+        void (*audio_mode_gpio)(struct bttv *btv, struct v4l2_tuner *tuner, int set);
+
         /* new gpio interface */
         spinlock_t gpio_lock;