media: omap3isp: Quit using struct v4l2_subdev.host_priv field

struct v4l2_subdev.host_priv is intended to be used by another driver. This
is hardly good design but back in the days of platform data was a quick
hack to get things done.

As the sub-device specific bus information can be stored to the ISP driver
specific struct allocated along with v4l2_async_subdev, keep the
information there and only there.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Tested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index 6cb1f0495804e8e0a937d7b774a4318ba72f0d12..c3014c82d64d7175c4766a69fe672140af5788f5 100644 (file)
--- a/drivers/media/platform/omap3isp/isp.c
+++ b/drivers/media/platform/omap3isp/isp.c
@@ -2188,26 +2188,12 @@ error:
        return -EINVAL;
 }
 
-static int isp_subdev_notifier_bound(struct v4l2_async_notifier *async,
-                                    struct v4l2_subdev *subdev,
-                                    struct v4l2_async_subdev *asd)
-{
-       struct isp_async_subdev *isd =
-               container_of(asd, struct isp_async_subdev, asd);
-
-       isd->sd = subdev;
-       isd->sd->host_priv = &isd->bus;
-
-       return 0;
-}
-
 static int isp_subdev_notifier_complete(struct v4l2_async_notifier *async)
 {
        struct isp_device *isp = container_of(async, struct isp_device,
                                              notifier);
        struct v4l2_device *v4l2_dev = &isp->v4l2_dev;
        struct v4l2_subdev *sd;
-       struct isp_bus_cfg *bus;
        int ret;
 
        ret = media_entity_enum_init(&isp->crashed, &isp->media_dev);
@@ -2215,13 +2201,13 @@ static int isp_subdev_notifier_complete(struct v4l2_async_notifier *async)
                return ret;
 
        list_for_each_entry(sd, &v4l2_dev->subdevs, list) {
-               /* Only try to link entities whose interface was set on bound */
-               if (sd->host_priv) {
-                       bus = (struct isp_bus_cfg *)sd->host_priv;
-                       ret = isp_link_entity(isp, &sd->entity, bus->interface);
-                       if (ret < 0)
-                               return ret;
-               }
+               if (!sd->asd)
+                       continue;
+
+               ret = isp_link_entity(isp, &sd->entity,
+                                     v4l2_subdev_to_bus_cfg(sd)->interface);
+               if (ret < 0)
+                       return ret;
        }
 
        ret = v4l2_device_register_subdev_nodes(&isp->v4l2_dev);
@@ -2399,7 +2385,6 @@ static int isp_probe(struct platform_device *pdev)
        if (ret < 0)
                goto error_register_entities;
 
-       isp->notifier.bound = isp_subdev_notifier_bound;
        isp->notifier.complete = isp_subdev_notifier_complete;
 
        ret = v4l2_async_notifier_register(&isp->v4l2_dev, &isp->notifier);

diff --git a/drivers/media/platform/omap3isp/isp.h b/drivers/media/platform/omap3isp/isp.h
index 2f2ae609c5488b307c2514cf2bbde9a67edc29d2..e528df6efc0918db7b5c7d1e38760a4381d85707 100644 (file)
--- a/drivers/media/platform/omap3isp/isp.h
+++ b/drivers/media/platform/omap3isp/isp.h
@@ -226,11 +226,13 @@ struct isp_device {
 };
 
 struct isp_async_subdev {
-       struct v4l2_subdev *sd;
        struct isp_bus_cfg bus;
        struct v4l2_async_subdev asd;
 };
 
+#define v4l2_subdev_to_bus_cfg(sd) \
+       (&container_of((sd)->asd, struct isp_async_subdev, asd)->bus)
+
 #define v4l2_dev_to_isp_device(dev) \
        container_of(dev, struct isp_device, v4l2_dev)
 

diff --git a/drivers/media/platform/omap3isp/ispccdc.c b/drivers/media/platform/omap3isp/ispccdc.c
index 4947876cfadf90676f955ebfd3bcade0c4994971..b66276ab5765d61a5c52cf1ab09ff80a748df80e 100644 (file)
--- a/drivers/media/platform/omap3isp/ispccdc.c
+++ b/drivers/media/platform/omap3isp/ispccdc.c
@@ -1139,8 +1139,10 @@ static void ccdc_configure(struct isp_ccdc_device *ccdc)
        pad = media_entity_remote_pad(&ccdc->pads[CCDC_PAD_SINK]);
        sensor = media_entity_to_v4l2_subdev(pad->entity);
        if (ccdc->input == CCDC_INPUT_PARALLEL) {
-               parcfg = &((struct isp_bus_cfg *)sensor->host_priv)
-                       ->bus.parallel;
+               struct v4l2_subdev *sd =
+                       to_isp_pipeline(&ccdc->subdev.entity)->external;
+
+               parcfg = &v4l2_subdev_to_bus_cfg(sd)->bus.parallel;
                ccdc->bt656 = parcfg->bt656;
        }
 
@@ -2412,11 +2414,11 @@ static int ccdc_link_validate(struct v4l2_subdev *sd,
 
        /* We've got a parallel sensor here. */
        if (ccdc->input == CCDC_INPUT_PARALLEL) {
-               struct isp_parallel_cfg *parcfg =
-                       &((struct isp_bus_cfg *)
-                         media_entity_to_v4l2_subdev(link->source->entity)
-                         ->host_priv)->bus.parallel;
-               parallel_shift = parcfg->data_lane_shift;
+               struct v4l2_subdev *sd =
+                       media_entity_to_v4l2_subdev(link->source->entity);
+               struct isp_bus_cfg *bus_cfg = v4l2_subdev_to_bus_cfg(sd);
+
+               parallel_shift = bus_cfg->bus.parallel.data_lane_shift;
        } else {
                parallel_shift = 0;
        }

diff --git a/drivers/media/platform/omap3isp/ispccp2.c b/drivers/media/platform/omap3isp/ispccp2.c
index 3db8df09cd9a262bf87fd20ff13b20be4a0aa402..e062939d0d054386b533ab8d3ab13afb3bdc1fbf 100644 (file)
--- a/drivers/media/platform/omap3isp/ispccp2.c
+++ b/drivers/media/platform/omap3isp/ispccp2.c
@@ -350,6 +350,7 @@ static void ccp2_lcx_config(struct isp_ccp2_device *ccp2,
  */
 static int ccp2_if_configure(struct isp_ccp2_device *ccp2)
 {
+       struct isp_pipeline *pipe = to_isp_pipeline(&ccp2->subdev.entity);
        const struct isp_bus_cfg *buscfg;
        struct v4l2_mbus_framefmt *format;
        struct media_pad *pad;
@@ -361,7 +362,7 @@ static int ccp2_if_configure(struct isp_ccp2_device *ccp2)
 
        pad = media_entity_remote_pad(&ccp2->pads[CCP2_PAD_SINK]);
        sensor = media_entity_to_v4l2_subdev(pad->entity);
-       buscfg = sensor->host_priv;
+       buscfg = v4l2_subdev_to_bus_cfg(pipe->external);
 
        ret = ccp2_phyif_config(ccp2, &buscfg->bus.ccp2);
        if (ret < 0)

diff --git a/drivers/media/platform/omap3isp/ispcsi2.c b/drivers/media/platform/omap3isp/ispcsi2.c
index 3ec37fed710b3477899a5b2ca471005586e98475..a4d3d030e81e20568b063d0544d18b64dd3a4d87 100644 (file)
--- a/drivers/media/platform/omap3isp/ispcsi2.c
+++ b/drivers/media/platform/omap3isp/ispcsi2.c
@@ -566,7 +566,7 @@ static int csi2_configure(struct isp_csi2_device *csi2)
 
        pad = media_entity_remote_pad(&csi2->pads[CSI2_PAD_SINK]);
        sensor = media_entity_to_v4l2_subdev(pad->entity);
-       buscfg = sensor->host_priv;
+       buscfg = v4l2_subdev_to_bus_cfg(pipe->external);
 
        csi2->frame_skip = 0;
        v4l2_subdev_call(sensor, sensor, g_skip_frames, &csi2->frame_skip);

diff --git a/drivers/media/platform/omap3isp/ispcsiphy.c b/drivers/media/platform/omap3isp/ispcsiphy.c
index ed1eb9907ae058b22b6774f72ce562935953b708..a28fb79abaac8265d2e45291e62ddfbcce280731 100644 (file)
--- a/drivers/media/platform/omap3isp/ispcsiphy.c
+++ b/drivers/media/platform/omap3isp/ispcsiphy.c
@@ -165,10 +165,7 @@ static int csiphy_set_power(struct isp_csiphy *phy, u32 power)
 static int omap3isp_csiphy_config(struct isp_csiphy *phy)
 {
        struct isp_pipeline *pipe = to_isp_pipeline(phy->entity);
-       struct isp_async_subdev *isd =
-               container_of(pipe->external->asd, struct isp_async_subdev, asd);
-       struct isp_bus_cfg *buscfg = pipe->external->host_priv ?
-               pipe->external->host_priv : &isd->bus;
+       struct isp_bus_cfg *buscfg = v4l2_subdev_to_bus_cfg(pipe->external);
        struct isp_csiphy_lanes_cfg *lanes;
        int csi2_ddrclk_khz;
        unsigned int num_data_lanes, used_lanes = 0;
@@ -311,7 +308,8 @@ void omap3isp_csiphy_release(struct isp_csiphy *phy)
        mutex_lock(&phy->mutex);
        if (phy->entity) {
                struct isp_pipeline *pipe = to_isp_pipeline(phy->entity);
-               struct isp_bus_cfg *buscfg = pipe->external->host_priv;
+               struct isp_bus_cfg *buscfg =
+                       v4l2_subdev_to_bus_cfg(pipe->external);
 
                csiphy_routing_cfg(phy, buscfg->interface, false,
                                   buscfg->bus.ccp2.phy_layer);