|
@@ -29,7 +29,7 @@
|
|
|
|
|
|
static inline struct imx_media_dev *notifier2dev(struct v4l2_async_notifier *n)
|
|
static inline struct imx_media_dev *notifier2dev(struct v4l2_async_notifier *n)
|
|
{
|
|
{
|
|
- return container_of(n, struct imx_media_dev, subdev_notifier);
|
|
|
|
|
|
+ return container_of(n, struct imx_media_dev, notifier);
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
/*
|
|
@@ -113,7 +113,7 @@ int imx_media_add_async_subdev(struct imx_media_dev *imxmd,
|
|
|
|
|
|
list_add_tail(&imxasd->list, &imxmd->asd_list);
|
|
list_add_tail(&imxasd->list, &imxmd->asd_list);
|
|
|
|
|
|
- imxmd->subdev_notifier.num_subdevs++;
|
|
|
|
|
|
+ imxmd->notifier.num_subdevs++;
|
|
|
|
|
|
dev_dbg(imxmd->md.dev, "%s: added %s, match type %s\n",
|
|
dev_dbg(imxmd->md.dev, "%s: added %s, match type %s\n",
|
|
__func__, np ? np->name : devname, np ? "FWNODE" : "DEVNAME");
|
|
__func__, np ? np->name : devname, np ? "FWNODE" : "DEVNAME");
|
|
@@ -532,7 +532,7 @@ static int imx_media_probe(struct platform_device *pdev)
|
|
goto unreg_dev;
|
|
goto unreg_dev;
|
|
}
|
|
}
|
|
|
|
|
|
- num_subdevs = imxmd->subdev_notifier.num_subdevs;
|
|
|
|
|
|
+ num_subdevs = imxmd->notifier.num_subdevs;
|
|
|
|
|
|
/* no subdevs? just bail */
|
|
/* no subdevs? just bail */
|
|
if (num_subdevs == 0) {
|
|
if (num_subdevs == 0) {
|
|
@@ -552,10 +552,10 @@ static int imx_media_probe(struct platform_device *pdev)
|
|
subdevs[i++] = &imxasd->asd;
|
|
subdevs[i++] = &imxasd->asd;
|
|
|
|
|
|
/* prepare the async subdev notifier and register it */
|
|
/* prepare the async subdev notifier and register it */
|
|
- imxmd->subdev_notifier.subdevs = subdevs;
|
|
|
|
- imxmd->subdev_notifier.ops = &imx_media_subdev_ops;
|
|
|
|
|
|
+ imxmd->notifier.subdevs = subdevs;
|
|
|
|
+ imxmd->notifier.ops = &imx_media_subdev_ops;
|
|
ret = v4l2_async_notifier_register(&imxmd->v4l2_dev,
|
|
ret = v4l2_async_notifier_register(&imxmd->v4l2_dev,
|
|
- &imxmd->subdev_notifier);
|
|
|
|
|
|
+ &imxmd->notifier);
|
|
if (ret) {
|
|
if (ret) {
|
|
v4l2_err(&imxmd->v4l2_dev,
|
|
v4l2_err(&imxmd->v4l2_dev,
|
|
"v4l2_async_notifier_register failed with %d\n", ret);
|
|
"v4l2_async_notifier_register failed with %d\n", ret);
|
|
@@ -580,7 +580,7 @@ static int imx_media_remove(struct platform_device *pdev)
|
|
|
|
|
|
v4l2_info(&imxmd->v4l2_dev, "Removing imx-media\n");
|
|
v4l2_info(&imxmd->v4l2_dev, "Removing imx-media\n");
|
|
|
|
|
|
- v4l2_async_notifier_unregister(&imxmd->subdev_notifier);
|
|
|
|
|
|
+ v4l2_async_notifier_unregister(&imxmd->notifier);
|
|
imx_media_remove_internal_subdevs(imxmd);
|
|
imx_media_remove_internal_subdevs(imxmd);
|
|
v4l2_device_unregister(&imxmd->v4l2_dev);
|
|
v4l2_device_unregister(&imxmd->v4l2_dev);
|
|
media_device_unregister(&imxmd->md);
|
|
media_device_unregister(&imxmd->md);
|