[media] V4L: Rename v4l2_async_bus_* to v4l2_async_match_*

enum v4l2_async_bus_type also selects a method subdevs are matched
in the notification handlers, rename it to v4l2_async_match_type
so V4L2_ASYNC_MATCH_OF entry can be further added for matching by
device tree node pointer.
Acked-and-tested-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
index f2de0066089a..dae9716e34b1 100644
--- a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
+++ b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
@@ -1837,9 +1837,9 @@ static int sh_mobile_ceu_probe(struct platform_device *pdev)
                 for (j = 0; pcdev->pdata->asd_sizes[j]; j++) {
                         for (i = 0; i < pcdev->pdata->asd_sizes[j]; i++, asd++) {
                                 dev_dbg(&pdev->dev, "%s(): subdev #%d, type %u\n",
-                                        __func__, i, (*asd)->bus_type);
-                                if ((*asd)->bus_type == V4L2_ASYNC_BUS_PLATFORM &&
-                                    !strncmp(name, (*asd)->match.platform.name,
+                                        __func__, i, (*asd)->match_type);
+                                if ((*asd)->match_type == V4L2_ASYNC_MATCH_DEVNAME &&
+                                    !strncmp(name, (*asd)->match.device_name.name,
                                              sizeof(name) - 1)) {
                                         pcdev->csi2_asd = *asd;
                                         break;
diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c
index 2dd0e5272941..8af572bcf03a 100644
--- a/drivers/media/platform/soc_camera/soc_camera.c
+++ b/drivers/media/platform/soc_camera/soc_camera.c
@@ -1475,7 +1475,7 @@ static int scan_async_group(struct soc_camera_host *ici,
                         break;
         }
 
-        if (i == size || asd[i]->bus_type != V4L2_ASYNC_BUS_I2C) {
+        if (i == size || asd[i]->match_type != V4L2_ASYNC_MATCH_I2C) {
                 /* All useless */
                 dev_err(ici->v4l2_dev.dev, "No I2C data source found!\n");
                 return -ENODEV;