From bdf79169de5df280a1749326fda802b0801dc597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ADra=20Canal?= Date: Fri, 27 Jun 2025 11:09:26 -0300 Subject: [PATCH] drm/vc4: tests: Use the correct return type in vc4_mock_atomic_add_output() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The function vc4_mock_atomic_add_output() should return a pointer, even during error treatment. Use the proper macros to create pointers from the error code. Signed-off-by: Maíra Canal --- drivers/gpu/drm/vc4/tests/vc4_mock_output.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/vc4/tests/vc4_mock_output.c b/drivers/gpu/drm/vc4/tests/vc4_mock_output.c index 5ee292ca683d7f..9715b808e2dad4 100644 --- a/drivers/gpu/drm/vc4/tests/vc4_mock_output.c +++ b/drivers/gpu/drm/vc4/tests/vc4_mock_output.c @@ -77,29 +77,29 @@ vc4_mock_atomic_add_output(struct kunit *test, encoder = vc4_find_encoder_by_type(drm, type); if (!encoder) - return -ENODEV; + return ERR_PTR(-ENODEV); crtc = vc4_find_crtc_for_encoder(test, encoder); if (!crtc) - return -ENODEV; + return ERR_PTR(-ENODEV); output = encoder_to_vc4_dummy_output(encoder); conn = &output->connector; conn_state = drm_atomic_get_connector_state(state, conn); if (IS_ERR(conn_state)) - return PTR_ERR(conn_state); + return ERR_CAST(conn_state); ret = drm_atomic_set_crtc_for_connector(conn_state, crtc); if (ret) - return ret; + return ERR_PTR(ret); crtc_state = drm_atomic_get_crtc_state(state, crtc); if (IS_ERR(crtc_state)) - return PTR_ERR(crtc_state); + return ERR_CAST(crtc_state); ret = drm_atomic_set_mode_for_crtc(crtc_state, &default_mode); if (ret) - return ret; + return ERR_PTR(ret); crtc_state->active = true;