media: rcar-csi2: Switch to using fwnode instead of OF
authorNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Mon, 14 Sep 2020 21:50:10 +0000 (23:50 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Mon, 16 Nov 2020 09:31:14 +0000 (10:31 +0100)
Use the fwnode_graph_get_endpoint_by_id() interface instead of
of_graph_get_endpoint_by_regs() to fetch the fwnode. This saves
translating between a device_node and fwnode_handle.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/media/platform/rcar-vin/rcar-csi2.c

index 79f229756805eb873c08042822e1af6d28f1b9b8..b84c3882ee3ae81eaecbe369f99a5142c614f81f 100644 (file)
@@ -876,31 +876,31 @@ static int rcsi2_parse_dt(struct rcar_csi2 *priv)
 {
        struct v4l2_async_subdev *asd;
        struct fwnode_handle *fwnode;
-       struct device_node *ep;
+       struct fwnode_handle *ep;
        struct v4l2_fwnode_endpoint v4l2_ep = { .bus_type = 0 };
        int ret;
 
-       ep = of_graph_get_endpoint_by_regs(priv->dev->of_node, 0, 0);
+       ep = fwnode_graph_get_endpoint_by_id(dev_fwnode(priv->dev), 0, 0, 0);
        if (!ep) {
                dev_err(priv->dev, "Not connected to subdevice\n");
                return -EINVAL;
        }
 
-       ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(ep), &v4l2_ep);
+       ret = v4l2_fwnode_endpoint_parse(ep, &v4l2_ep);
        if (ret) {
                dev_err(priv->dev, "Could not parse v4l2 endpoint\n");
-               of_node_put(ep);
+               fwnode_handle_put(ep);
                return -EINVAL;
        }
 
        ret = rcsi2_parse_v4l2(priv, &v4l2_ep);
        if (ret) {
-               of_node_put(ep);
+               fwnode_handle_put(ep);
                return ret;
        }
 
-       fwnode = fwnode_graph_get_remote_endpoint(of_fwnode_handle(ep));
-       of_node_put(ep);
+       fwnode = fwnode_graph_get_remote_endpoint(ep);
+       fwnode_handle_put(ep);
 
        dev_dbg(priv->dev, "Found '%pOF'\n", to_of_node(fwnode));