From abc1308f0bb89d1e59d1eccb71f85161f8e80108 Mon Sep 17 00:00:00 2001
From: Frank Schaefer <fschaefer.oss@googlemail.com>
Date: Mon, 24 Mar 2014 16:33:10 -0300
Subject: [PATCH] [media] em28xx: move struct v4l2_ctrl_handler ctrl_handler
from struct em28xx to struct v4l2
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
Controls are only applicable to V4L2 module. Move the corresponding
data structs to the proper place.
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
---
drivers/media/usb/em28xx/em28xx-video.c | 13 +++++++++----
drivers/media/usb/em28xx/em28xx.h | 3 ++-
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index 814403dee043..a8ddc4cada95 100644
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -1134,7 +1134,9 @@ static void em28xx_ctrl_notify(struct v4l2_ctrl *ctrl, void *priv)
static int em28xx_s_ctrl(struct v4l2_ctrl *ctrl)
{
- struct em28xx *dev = container_of(ctrl->handler, struct em28xx, ctrl_handler);
+ struct em28xx_v4l2 *v4l2 =
+ container_of(ctrl->handler, struct em28xx_v4l2, ctrl_handler);
+ struct em28xx *dev = v4l2->dev;
int ret = -EINVAL;
switch (ctrl->id) {
@@ -1845,6 +1847,7 @@ void em28xx_free_v4l2(struct kref *ref)
{
struct em28xx_v4l2 *v4l2 = container_of(ref, struct em28xx_v4l2, ref);
+ v4l2->dev->v4l2 = NULL;
kfree(v4l2);
}
@@ -1964,7 +1967,7 @@ static int em28xx_v4l2_fini(struct em28xx *dev)
video_unregister_device(dev->vdev);
}
- v4l2_ctrl_handler_free(&dev->ctrl_handler);
+ v4l2_ctrl_handler_free(&v4l2->ctrl_handler);
v4l2_device_unregister(&v4l2->v4l2_dev);
if (dev->clk) {
@@ -2272,7 +2275,7 @@ static int em28xx_v4l2_init(struct em28xx *dev)
u8 val;
int ret;
unsigned int maxw;
- struct v4l2_ctrl_handler *hdl = &dev->ctrl_handler;
+ struct v4l2_ctrl_handler *hdl;
struct em28xx_v4l2 *v4l2;
if (dev->is_audio_only) {
@@ -2296,6 +2299,7 @@ static int em28xx_v4l2_init(struct em28xx *dev)
return -ENOMEM;
}
kref_init(&v4l2->ref);
+ v4l2->dev = dev;
dev->v4l2 = v4l2;
ret = v4l2_device_register(&dev->udev->dev, &v4l2->v4l2_dev);
@@ -2304,6 +2308,7 @@ static int em28xx_v4l2_init(struct em28xx *dev)
goto err;
}
+ hdl = &v4l2->ctrl_handler;
v4l2_ctrl_handler_init(hdl, 8);
v4l2->v4l2_dev.ctrl_handler = hdl;
@@ -2590,7 +2595,7 @@ static int em28xx_v4l2_init(struct em28xx *dev)
return 0;
unregister_dev:
- v4l2_ctrl_handler_free(&dev->ctrl_handler);
+ v4l2_ctrl_handler_free(&v4l2->ctrl_handler);
v4l2_device_unregister(&v4l2->v4l2_dev);
err:
dev->v4l2 = NULL;
diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h
index 05deb84f70bb..24b2a9a73366 100644
--- a/drivers/media/usb/em28xx/em28xx.h
+++ b/drivers/media/usb/em28xx/em28xx.h
@@ -500,8 +500,10 @@ struct em28xx_eeprom {
struct em28xx_v4l2 {
struct kref ref;
+ struct em28xx *dev;
struct v4l2_device v4l2_dev;
+ struct v4l2_ctrl_handler ctrl_handler;
};
struct em28xx_audio {
@@ -567,7 +569,6 @@ struct em28xx {
unsigned int has_alsa_audio:1;
unsigned int is_audio_only:1;
- struct v4l2_ctrl_handler ctrl_handler;
struct v4l2_clk *clk;
struct em28xx_board board;
--
2.34.1