drm/bridge: analogix: Remove redundant checks on existence of bridge->encoder

The checks on the existence of bridge->encoder in the implementation of
drm_bridge_funcs::attach() is not necessary, as it has already been checked
in the drm_bridge_attach() function call by previous bridge or KMS driver.
The drm_bridge_attach() will quit with a negative error code returned if
it fails for some reasons, hence, it is guaranteed that the .encoder member
of the drm_bridge instance is not NULL when various bridge attach functions
are called.

Remove the redundant checking codes "if (!bridge->encoder) { ... }".

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Sui Jingfeng <sui.jingfeng@linux.dev>
Signed-off-by: Robert Foss <rfoss@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240513153109.46786-13-sui.jingfeng@linux.dev

diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
index c9e35731e6a1afe08d81a2b6fa3ce5ee28098ac1..cfe43d2ca3be09947d71f9c4cb815ce345bb9b47 100644 (file)
--- a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
@@ -528,11 +528,6 @@ static int anx6345_bridge_attach(struct drm_bridge *bridge,
                return -EINVAL;
        }
 
-       if (!bridge->encoder) {
-               DRM_ERROR("Parent encoder object not found");
-               return -ENODEV;
-       }
-
        /* Register aux channel */
        anx6345->aux.name = "DP-AUX";
        anx6345->aux.dev = &anx6345->client->dev;

diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c
index 5748a8581af43926bfd5e4d43748bb4ae7d5ee0e..58875dde496f399dcc030ea87e18399b3281a5a7 100644 (file)
--- a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c
@@ -897,11 +897,6 @@ static int anx78xx_bridge_attach(struct drm_bridge *bridge,
                return -EINVAL;
        }
 
-       if (!bridge->encoder) {
-               DRM_ERROR("Parent encoder object not found");
-               return -ENODEV;
-       }
-
        /* Register aux channel */
        anx78xx->aux.name = "DP-AUX";
        anx78xx->aux.dev = &anx78xx->client->dev;

diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
index df9370e0ff2306c73d829a44b63eb5b0c1876850..7b841232321fc4e73173531983566bcfbd86c02c 100644 (file)
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@ -1228,11 +1228,6 @@ static int analogix_dp_bridge_attach(struct drm_bridge *bridge,
                return -EINVAL;
        }
 
-       if (!bridge->encoder) {
-               DRM_ERROR("Parent encoder object not found");
-               return -ENODEV;
-       }
-
        if (!dp->plat_data->skip_connector) {
                connector = &dp->connector;
                connector->polled = DRM_CONNECTOR_POLL_HPD;

diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c
index 59e9ad34996965dd2c3c4a94154dd82188108cff..3d09efa4199cef54e285e0348920b73d8ab44b63 100644 (file)
--- a/drivers/gpu/drm/bridge/analogix/anx7625.c
+++ b/drivers/gpu/drm/bridge/analogix/anx7625.c
@@ -2193,11 +2193,6 @@ static int anx7625_bridge_attach(struct drm_bridge *bridge,
        if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR))
                return -EINVAL;
 
-       if (!bridge->encoder) {
-               DRM_DEV_ERROR(dev, "Parent encoder object not found");
-               return -ENODEV;
-       }
-
        ctx->aux.drm_dev = bridge->dev;
        err = drm_dp_aux_register(&ctx->aux);
        if (err) {
@@ -2435,11 +2430,6 @@ static void anx7625_bridge_atomic_enable(struct drm_bridge *bridge,
 
        dev_dbg(dev, "drm atomic enable\n");
 
-       if (!bridge->encoder) {
-               dev_err(dev, "Parent encoder object not found");
-               return;
-       }
-
        connector = drm_atomic_get_new_connector_for_encoder(state->base.state,
                                                             bridge->encoder);
        if (!connector)