Commit 7a86969b authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

[media] omap24xxcam: add v4l2_device and replace parent with v4l2_dev

This driver did not yet support struct v4l2_device, so add it. This
make it possible to replace the deprecated parent field with the
v4l2_dev field, allowing the eventual removal of the parent field.
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b60f9aa1
...@@ -1656,7 +1656,7 @@ static int omap24xxcam_device_register(struct v4l2_int_device *s) ...@@ -1656,7 +1656,7 @@ static int omap24xxcam_device_register(struct v4l2_int_device *s)
} }
vfd->release = video_device_release; vfd->release = video_device_release;
vfd->parent = cam->dev; vfd->v4l2_dev = &cam->v4l2_dev;
strlcpy(vfd->name, CAM_NAME, sizeof(vfd->name)); strlcpy(vfd->name, CAM_NAME, sizeof(vfd->name));
vfd->fops = &omap24xxcam_fops; vfd->fops = &omap24xxcam_fops;
...@@ -1752,6 +1752,11 @@ static int omap24xxcam_probe(struct platform_device *pdev) ...@@ -1752,6 +1752,11 @@ static int omap24xxcam_probe(struct platform_device *pdev)
cam->dev = &pdev->dev; cam->dev = &pdev->dev;
if (v4l2_device_register(&pdev->dev, &cam->v4l2_dev)) {
dev_err(&pdev->dev, "v4l2_device_register failed\n");
goto err;
}
/* /*
* Impose a lower limit on the amount of memory allocated for * Impose a lower limit on the amount of memory allocated for
* capture. We require at least enough memory to double-buffer * capture. We require at least enough memory to double-buffer
...@@ -1849,6 +1854,8 @@ static int omap24xxcam_remove(struct platform_device *pdev) ...@@ -1849,6 +1854,8 @@ static int omap24xxcam_remove(struct platform_device *pdev)
cam->mmio_base_phys = 0; cam->mmio_base_phys = 0;
} }
v4l2_device_unregister(&cam->v4l2_dev);
kfree(cam); kfree(cam);
return 0; return 0;
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <media/videobuf-dma-sg.h> #include <media/videobuf-dma-sg.h>
#include <media/v4l2-int-device.h> #include <media/v4l2-int-device.h>
#include <media/v4l2-device.h>
/* /*
* *
...@@ -462,6 +463,8 @@ struct omap24xxcam_device { ...@@ -462,6 +463,8 @@ struct omap24xxcam_device {
*/ */
struct mutex mutex; struct mutex mutex;
struct v4l2_device v4l2_dev;
/*** general driver state information ***/ /*** general driver state information ***/
atomic_t users; atomic_t users;
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment