Parse async sub-devices by using
v4l2_subdev_fwnode_reference_parse_sensor_common().
These types devices aren't directly related to the sensor, but are
nevertheless handled by the et8ek8 driver due to the relationship of these
component to the main part of the camera module --- the sensor.
Signed-off-by: Pavel Machek <pavel@xxxxxx> # Not yet ready -- broken whitespace
---
Whitespace is horribly bad. But otherwise... does it look ok?
diff --git a/drivers/media/i2c/et8ek8/et8ek8_driver.c b/drivers/media/i2c/et8ek8/et8ek8_driver.c
index c14f0fd..7714d2c 100644
--- a/drivers/media/i2c/et8ek8/et8ek8_driver.c
+++ b/drivers/media/i2c/et8ek8/et8ek8_driver.c
@@ -34,10 +34,12 @@
#include <linux/sort.h>
#include <linux/v4l2-mediabus.h>
+#include <media/v4l2-async.h>
#include <media/media-entity.h>
#include <media/v4l2-ctrls.h>
#include <media/v4l2-device.h>
#include <media/v4l2-subdev.h>
+#include <media/v4l2-fwnode.h>
#include "et8ek8_reg.h"
@@ -46,6 +48,7 @@
#define ET8EK8_MAX_MSG 8
struct et8ek8_sensor {
+ struct v4l2_async_notifier notifier;
struct v4l2_subdev subdev;
struct media_pad pad;
struct v4l2_mbus_framefmt format;
@@ -1446,6 +1449,11 @@ static int et8ek8_probe(struct i2c_client *client,
sensor->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
sensor->subdev.internal_ops = &et8ek8_internal_ops;
+ ret = v4l2_fwnode_reference_parse_sensor_common(
+ &client->dev, &sensor->notifier);
+ if (ret < 0 && ret != -ENOENT)
+ return ret;
+
sensor->pad.flags = MEDIA_PAD_FL_SOURCE;
ret = media_entity_pads_init(&sensor->subdev.entity, 1, &sensor->pad);
if (ret < 0) {
@@ -1453,14 +1461,21 @@ static int et8ek8_probe(struct i2c_client *client,
goto err_mutex;
}
+ ret = v4l2_async_subdev_notifier_register(&sensor->subdev,
+ &sensor->notifier);
+ if (ret)
+ goto err_entity;
+
ret = v4l2_async_register_subdev(&sensor->subdev);
if (ret < 0)
- goto err_entity;
+ goto err_async;
dev_dbg(dev, "initialized!\n");
return 0;
+err_async:
+ v4l2_async_notifier_unregister(&sensor->notifier);
err_entity:
media_entity_cleanup(&sensor->subdev.entity);
err_mutex:
@@ -1480,6 +1495,7 @@ static int __exit et8ek8_remove(struct i2c_client *client)
}
v4l2_device_unregister_subdev(&sensor->subdev);
+ v4l2_async_notifier_unregister(&sensor->notifier);
device_remove_file(&client->dev, &dev_attr_priv_mem);
v4l2_ctrl_handler_free(&sensor->ctrl_handler);
v4l2_async_unregister_subdev(&sensor->subdev);
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Attachment:
signature.asc
Description: Digital signature
