media: ipu3-cio2: Introduce to_cio2_device() helper macro

Provide to_cio2_device() helper macro and convert users to make
code easier to read.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
index 0cb102e8dff10c186181da7224f98acccfec0b52..8bcba168cc5762bfe94ed06e7c0e96867fa4cd0d 100644 (file)
--- a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
+++ b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
@@ -1376,8 +1376,7 @@ static int cio2_notifier_bound(struct v4l2_async_notifier *notifier,
                               struct v4l2_subdev *sd,
                               struct v4l2_async_subdev *asd)
 {
-       struct cio2_device *cio2 = container_of(notifier,
-                                       struct cio2_device, notifier);
+       struct cio2_device *cio2 = to_cio2_device(notifier);
        struct sensor_async_subdev *s_asd = to_sensor_asd(asd);
        struct cio2_queue *q;
 
@@ -1398,8 +1397,7 @@ static void cio2_notifier_unbind(struct v4l2_async_notifier *notifier,
                                 struct v4l2_subdev *sd,
                                 struct v4l2_async_subdev *asd)
 {
-       struct cio2_device *cio2 = container_of(notifier,
-                                               struct cio2_device, notifier);
+       struct cio2_device *cio2 = to_cio2_device(notifier);
        struct sensor_async_subdev *s_asd = to_sensor_asd(asd);
 
        cio2->queue[s_asd->csi2.port].sensor = NULL;
@@ -1408,8 +1406,7 @@ static void cio2_notifier_unbind(struct v4l2_async_notifier *notifier,
 /* .complete() is called after all subdevices have been located */
 static int cio2_notifier_complete(struct v4l2_async_notifier *notifier)
 {
-       struct cio2_device *cio2 = container_of(notifier, struct cio2_device,
-                                               notifier);
+       struct cio2_device *cio2 = to_cio2_device(notifier);
        struct device *dev = &cio2->pci_dev->dev;
        struct sensor_async_subdev *s_asd;
        struct v4l2_async_subdev *asd;

diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2.h b/drivers/media/pci/intel/ipu3/ipu3-cio2.h
index f82f9b2590b9ae9998de6983a49151efa73fe4e7..3a1f394e05aa7c28a7cfe86cc743e0646c3a79c5 100644 (file)
--- a/drivers/media/pci/intel/ipu3/ipu3-cio2.h
+++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.h
@@ -401,6 +401,8 @@ struct cio2_device {
        dma_addr_t dummy_lop_bus_addr;
 };
 
+#define to_cio2_device(n)      container_of(n, struct cio2_device, notifier)
+
 /**************** Virtual channel ****************/
 /*
  * This should come from sensor driver. No