From 70e906d3c688491e181446afa27bea32ce241d6a Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 24 Mar 2023 09:58:15 +0100 Subject: [PATCH] drm/vc4: tests: Drop drm parameter for vc4_find_crtc_for_encoder The DRM device pointer and the DRM encoder pointer are redundant, since the latter is attached to the former and we can just follow the drm_encoder->dev pointer. Let's remove the drm_device pointer argument. Signed-off-by: Maxime Ripard --- drivers/gpu/drm/vc4/tests/vc4_mock.h | 2 +- drivers/gpu/drm/vc4/tests/vc4_mock_output.c | 4 ++-- drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) --- a/drivers/gpu/drm/vc4/tests/vc4_mock.h +++ b/drivers/gpu/drm/vc4/tests/vc4_mock.h @@ -7,9 +7,9 @@ static inline struct drm_crtc *vc4_find_crtc_for_encoder(struct kunit *test, - struct drm_device *drm, struct drm_encoder *encoder) { + struct drm_device *drm = encoder->dev; struct drm_crtc *crtc; KUNIT_ASSERT_EQ(test, hweight32(encoder->possible_crtcs), 1); --- a/drivers/gpu/drm/vc4/tests/vc4_mock_output.c +++ b/drivers/gpu/drm/vc4/tests/vc4_mock_output.c @@ -77,7 +77,7 @@ int vc4_mock_atomic_add_output(struct ku encoder = vc4_find_encoder_by_type(drm, type); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, encoder); - crtc = vc4_find_crtc_for_encoder(test, drm, encoder); + crtc = vc4_find_crtc_for_encoder(test, encoder); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc); output = container_of(encoder, struct vc4_dummy_output, encoder.base); @@ -115,7 +115,7 @@ int vc4_mock_atomic_del_output(struct ku encoder = vc4_find_encoder_by_type(drm, type); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, encoder); - crtc = vc4_find_crtc_for_encoder(test, drm, encoder); + crtc = vc4_find_crtc_for_encoder(test, encoder); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc); crtc_state = drm_atomic_get_crtc_state(state, crtc); --- a/drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c +++ b/drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c @@ -132,7 +132,7 @@ get_vc4_crtc_state_for_encoder(struct ku encoder = vc4_find_encoder_by_type(drm, type); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, encoder); - crtc = vc4_find_crtc_for_encoder(test, drm, encoder); + crtc = vc4_find_crtc_for_encoder(test, encoder); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc); new_crtc_state = drm_atomic_get_new_crtc_state(state, crtc);