drm/bridge: tfp410: convert to of_drm_find_and_get_bridge()

of_drm_find_bridge() is deprecated. Move to its replacement
of_drm_find_and_get_bridge() which gets a bridge reference, and ensure it
is put when done by using the drm_bridge::next_bridge pointer.

Acked-by: Maxime Ripard <mripard@kernel.org>
Link: https://patch.msgid.link/20260109-drm-bridge-alloc-getput-drm_of_find_bridge-2-v2-5-8bad3ef90b9f@bootlin.com
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>

diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti-tfp410.c
index b80ee089f88014ec683ac14cbbea8cf69b2d2424..11b5bb50e9f42e613fe9b1f8b6d8a869535be1de 100644 (file)
--- a/drivers/gpu/drm/bridge/ti-tfp410.c
+++ b/drivers/gpu/drm/bridge/ti-tfp410.c
@@ -30,7 +30,6 @@ struct tfp410 {
        struct gpio_desc        *powerdown;
 
        struct drm_bridge_timings timings;
-       struct drm_bridge       *next_bridge;
 
        struct device *dev;
 };
@@ -53,8 +52,8 @@ static int tfp410_get_modes(struct drm_connector *connector)
        const struct drm_edid *drm_edid;
        int ret;
 
-       if (dvi->next_bridge->ops & DRM_BRIDGE_OP_EDID) {
-               drm_edid = drm_bridge_edid_read(dvi->next_bridge, connector);
+       if (dvi->bridge.next_bridge->ops & DRM_BRIDGE_OP_EDID) {
+               drm_edid = drm_bridge_edid_read(dvi->bridge.next_bridge, connector);
                if (!drm_edid)
                        DRM_INFO("EDID read failed. Fallback to standard modes\n");
        } else {
@@ -89,7 +88,7 @@ tfp410_connector_detect(struct drm_connector *connector, bool force)
 {
        struct tfp410 *dvi = drm_connector_to_tfp410(connector);
 
-       return drm_bridge_detect(dvi->next_bridge, connector);
+       return drm_bridge_detect(dvi->bridge.next_bridge, connector);
 }
 
 static const struct drm_connector_funcs tfp410_con_funcs = {
@@ -126,7 +125,7 @@ static int tfp410_attach(struct drm_bridge *bridge,
        struct tfp410 *dvi = drm_bridge_to_tfp410(bridge);
        int ret;
 
-       ret = drm_bridge_attach(encoder, dvi->next_bridge, bridge,
+       ret = drm_bridge_attach(encoder, dvi->bridge.next_bridge, bridge,
                                DRM_BRIDGE_ATTACH_NO_CONNECTOR);
        if (ret < 0)
                return ret;
@@ -134,14 +133,14 @@ static int tfp410_attach(struct drm_bridge *bridge,
        if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)
                return 0;
 
-       if (dvi->next_bridge->ops & DRM_BRIDGE_OP_DETECT)
+       if (dvi->bridge.next_bridge->ops & DRM_BRIDGE_OP_DETECT)
                dvi->connector.polled = DRM_CONNECTOR_POLL_HPD;
        else
                dvi->connector.polled = DRM_CONNECTOR_POLL_CONNECT | DRM_CONNECTOR_POLL_DISCONNECT;
 
-       if (dvi->next_bridge->ops & DRM_BRIDGE_OP_HPD) {
+       if (dvi->bridge.next_bridge->ops & DRM_BRIDGE_OP_HPD) {
                INIT_DELAYED_WORK(&dvi->hpd_work, tfp410_hpd_work_func);
-               drm_bridge_hpd_enable(dvi->next_bridge, tfp410_hpd_callback,
+               drm_bridge_hpd_enable(dvi->bridge.next_bridge, tfp410_hpd_callback,
                                      dvi);
        }
 
@@ -149,8 +148,8 @@ static int tfp410_attach(struct drm_bridge *bridge,
                                 &tfp410_con_helper_funcs);
        ret = drm_connector_init_with_ddc(bridge->dev, &dvi->connector,
                                          &tfp410_con_funcs,
-                                         dvi->next_bridge->type,
-                                         dvi->next_bridge->ddc);
+                                         dvi->bridge.next_bridge->type,
+                                         dvi->bridge.next_bridge->ddc);
        if (ret) {
                dev_err(dvi->dev, "drm_connector_init_with_ddc() failed: %d\n",
                        ret);
@@ -169,8 +168,8 @@ static void tfp410_detach(struct drm_bridge *bridge)
 {
        struct tfp410 *dvi = drm_bridge_to_tfp410(bridge);
 
-       if (dvi->connector.dev && dvi->next_bridge->ops & DRM_BRIDGE_OP_HPD) {
-               drm_bridge_hpd_disable(dvi->next_bridge);
+       if (dvi->connector.dev && dvi->bridge.next_bridge->ops & DRM_BRIDGE_OP_HPD) {
+               drm_bridge_hpd_disable(dvi->bridge.next_bridge);
                cancel_delayed_work_sync(&dvi->hpd_work);
        }
 }
@@ -362,10 +361,10 @@ static int tfp410_init(struct device *dev, bool i2c)
        if (!node)
                return -ENODEV;
 
-       dvi->next_bridge = of_drm_find_bridge(node);
+       dvi->bridge.next_bridge = of_drm_find_and_get_bridge(node);
        of_node_put(node);
 
-       if (!dvi->next_bridge)
+       if (!dvi->bridge.next_bridge)
                return -EPROBE_DEFER;
 
        /* Get the powerdown GPIO. */