Skip to content

Commit 8531027

Browse files
mairacanalpelwell
authored andcommitted
drm/vc4: tests: Use the correct return type in vc4_mock_atomic_add_output()
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 <mcanal@igalia.com>
1 parent a231354 commit 8531027

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/gpu/drm/vc4/tests/vc4_mock_output.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,29 +77,29 @@ vc4_mock_atomic_add_output(struct kunit *test,
7777

7878
encoder = vc4_find_encoder_by_type(drm, type);
7979
if (!encoder)
80-
return -ENODEV;
80+
return ERR_PTR(-ENODEV);
8181

8282
crtc = vc4_find_crtc_for_encoder(test, encoder);
8383
if (!crtc)
84-
return -ENODEV;
84+
return ERR_PTR(-ENODEV);
8585

8686
output = encoder_to_vc4_dummy_output(encoder);
8787
conn = &output->connector;
8888
conn_state = drm_atomic_get_connector_state(state, conn);
8989
if (IS_ERR(conn_state))
90-
return PTR_ERR(conn_state);
90+
return ERR_CAST(conn_state);
9191

9292
ret = drm_atomic_set_crtc_for_connector(conn_state, crtc);
9393
if (ret)
94-
return ret;
94+
return ERR_PTR(ret);
9595

9696
crtc_state = drm_atomic_get_crtc_state(state, crtc);
9797
if (IS_ERR(crtc_state))
98-
return PTR_ERR(crtc_state);
98+
return ERR_CAST(crtc_state);
9999

100100
ret = drm_atomic_set_mode_for_crtc(crtc_state, &default_mode);
101101
if (ret)
102-
return ret;
102+
return ERR_PTR(ret);
103103

104104
crtc_state->active = true;
105105

0 commit comments

Comments
 (0)