media: staging/imx: Rename root notifier

Rename the imx-media root async notifier from "subdev_notifier" to
simply "notifier", so as not to confuse it with true subdev notifiers.
No functional changes.

Signed-off-by: Steve Longerbeam <slongerbeam@gmail.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/staging/media/imx/imx-media-dev.c b/drivers/staging/media/imx/imx-media-dev.c
index 718954f969bd7cac7a0818e9f0dc08535342a1e0..a9faee4b2495fb700d82c830152efc93b409bb4f 100644 (file)
--- a/drivers/staging/media/imx/imx-media-dev.c
+++ b/drivers/staging/media/imx/imx-media-dev.c
@@ -29,7 +29,7 @@
 
 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);
 
-       imxmd->subdev_notifier.num_subdevs++;
+       imxmd->notifier.num_subdevs++;
 
        dev_dbg(imxmd->md.dev, "%s: added %s, match type %s\n",
                __func__, np ? np->name : devname, np ? "FWNODE" : "DEVNAME");
@@ -532,7 +532,7 @@ static int imx_media_probe(struct platform_device *pdev)
                goto unreg_dev;
        }
 
-       num_subdevs = imxmd->subdev_notifier.num_subdevs;
+       num_subdevs = imxmd->notifier.num_subdevs;
 
        /* no subdevs? just bail */
        if (num_subdevs == 0) {
@@ -552,10 +552,10 @@ static int imx_media_probe(struct platform_device *pdev)
                subdevs[i++] = &imxasd->asd;
 
        /* 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,
-                                          &imxmd->subdev_notifier);
+                                          &imxmd->notifier);
        if (ret) {
                v4l2_err(&imxmd->v4l2_dev,
                         "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_async_notifier_unregister(&imxmd->subdev_notifier);
+       v4l2_async_notifier_unregister(&imxmd->notifier);
        imx_media_remove_internal_subdevs(imxmd);
        v4l2_device_unregister(&imxmd->v4l2_dev);
        media_device_unregister(&imxmd->md);

diff --git a/drivers/staging/media/imx/imx-media.h b/drivers/staging/media/imx/imx-media.h
index 57bd094cf765c52d8ea1c8e2b464dcd2711ff6dc..227b79ccc1947dd9a96d96e4332f0f4692f91f0a 100644 (file)
--- a/drivers/staging/media/imx/imx-media.h
+++ b/drivers/staging/media/imx/imx-media.h
@@ -150,7 +150,7 @@ struct imx_media_dev {
 
        /* for async subdev registration */
        struct list_head asd_list;
-       struct v4l2_async_notifier subdev_notifier;
+       struct v4l2_async_notifier notifier;
 };
 
 enum codespace_sel {