On 11/28/22 11:53, Maxime Ripard wrote:
> The device name isn't really useful, we can just define it instead of
> exposing it in the API.
>
> Signed-off-by: Maxime Ripard <[email protected]>
Reviewed-by: Maíra Canal <[email protected]>
Best Regards
- Maíra Canal
> ---
> drivers/gpu/drm/tests/drm_client_modeset_test.c | 3 +--
> drivers/gpu/drm/tests/drm_kunit_helpers.c | 7 ++++---
> drivers/gpu/drm/tests/drm_modes_test.c | 3 +--
> drivers/gpu/drm/tests/drm_probe_helper_test.c | 3 +--
> include/drm/drm_kunit_helpers.h | 3 +--
> 5 files changed, 8 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/tests/drm_client_modeset_test.c b/drivers/gpu/drm/tests/drm_client_modeset_test.c
> index 6cdf08f582ce..4d475ae6dbb6 100644
> --- a/drivers/gpu/drm/tests/drm_client_modeset_test.c
> +++ b/drivers/gpu/drm/tests/drm_client_modeset_test.c
> @@ -59,8 +59,7 @@ static int drm_client_modeset_test_init(struct kunit *test)
>
> test->priv = priv;
>
> - priv->drm = drm_kunit_helper_alloc_drm_device(test, DRIVER_MODESET,
> - "drm-client-modeset-test");
> + priv->drm = drm_kunit_helper_alloc_drm_device(test, DRIVER_MODESET);
> KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv->drm);
>
> ret = drmm_connector_init(priv->drm, &priv->connector,
> diff --git a/drivers/gpu/drm/tests/drm_kunit_helpers.c b/drivers/gpu/drm/tests/drm_kunit_helpers.c
> index 2f67f6cf78d0..16c7926d83c2 100644
> --- a/drivers/gpu/drm/tests/drm_kunit_helpers.c
> +++ b/drivers/gpu/drm/tests/drm_kunit_helpers.c
> @@ -8,6 +8,8 @@
>
> #include <linux/device.h>
>
> +#define KUNIT_DEVICE_NAME "drm-kunit-mock-device"
> +
> struct kunit_dev {
> struct drm_device base;
> };
> @@ -39,7 +41,6 @@ static void dev_free(struct kunit_resource *res)
> * drm_kunit_helper_alloc_drm_device - Allocates a mock DRM device for Kunit tests
> * @test: The test context object
> * @features: Mocked DRM device driver features
> - * @name: Name of the struct &device to allocate
> *
> * This function allocates a new struct &device, creates a struct
> * &drm_driver and will create a struct &drm_device using both.
> @@ -54,7 +55,7 @@ static void dev_free(struct kunit_resource *res)
> */
> struct drm_device *
> drm_kunit_helper_alloc_drm_device(struct kunit *test,
> - u32 features, char *name)
> + u32 features)
> {
> struct kunit_dev *kdev;
> struct drm_device *drm;
> @@ -62,7 +63,7 @@ drm_kunit_helper_alloc_drm_device(struct kunit *test,
> struct device *dev;
> int ret;
>
> - dev = kunit_alloc_resource(test, dev_init, dev_free, GFP_KERNEL, name);
> + dev = kunit_alloc_resource(test, dev_init, dev_free, GFP_KERNEL, KUNIT_DEVICE_NAME);
> if (!dev)
> return ERR_PTR(-ENOMEM);
>
> diff --git a/drivers/gpu/drm/tests/drm_modes_test.c b/drivers/gpu/drm/tests/drm_modes_test.c
> index 6723089dff9f..35965ad86188 100644
> --- a/drivers/gpu/drm/tests/drm_modes_test.c
> +++ b/drivers/gpu/drm/tests/drm_modes_test.c
> @@ -22,8 +22,7 @@ static int drm_test_modes_init(struct kunit *test)
> priv = kunit_kzalloc(test, sizeof(*priv), GFP_KERNEL);
> KUNIT_ASSERT_NOT_NULL(test, priv);
>
> - priv->drm = drm_kunit_helper_alloc_drm_device(test, DRIVER_MODESET,
> - "drm-modes-test");
> + priv->drm = drm_kunit_helper_alloc_drm_device(test, DRIVER_MODESET);
> KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv->drm);
>
> test->priv = priv;
> diff --git a/drivers/gpu/drm/tests/drm_probe_helper_test.c b/drivers/gpu/drm/tests/drm_probe_helper_test.c
> index 85236ff4744f..be61a92b79d2 100644
> --- a/drivers/gpu/drm/tests/drm_probe_helper_test.c
> +++ b/drivers/gpu/drm/tests/drm_probe_helper_test.c
> @@ -40,8 +40,7 @@ static int drm_probe_helper_test_init(struct kunit *test)
> test->priv = priv;
>
> priv->drm = drm_kunit_helper_alloc_drm_device(test,
> - DRIVER_MODESET | DRIVER_ATOMIC,
> - "drm-probe-helper-test");
> + DRIVER_MODESET | DRIVER_ATOMIC);
> KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv->drm);
>
> connector = &priv->connector;
> diff --git a/include/drm/drm_kunit_helpers.h b/include/drm/drm_kunit_helpers.h
> index e9870c7911fe..6c12b1426ba0 100644
> --- a/include/drm/drm_kunit_helpers.h
> +++ b/include/drm/drm_kunit_helpers.h
> @@ -8,7 +8,6 @@ struct kunit;
>
> struct drm_device *
> drm_kunit_helper_alloc_drm_device(struct kunit *test,
> - u32 features,
> - char *name);
> + u32 features);
>
> #endif // DRM_KUNIT_HELPERS_H_
>