drm/tests: helpers: Rename the device init helper

The name doesn't really fit the conventions for the other helpers in
DRM/KMS, so let's rename it to make it obvious that we allocate a new
DRM device.

Reviewed-by: Maíra Canal <mcanal@igalia.com>
Link: https://lore.kernel.org/r/20221123-rpi-kunit-tests-v3-5-4615a663a84a@cerno.tech
Signed-off-by: Maxime Ripard <maxime@cerno.tech>

diff --git a/drivers/gpu/drm/tests/drm_client_modeset_test.c b/drivers/gpu/drm/tests/drm_client_modeset_test.c
index ed2f62e92fea41a721e086ab933470f3f2431eee..6cdf08f582ced4e4a80b7a4bdaf24230c09b7529 100644 (file)
--- a/drivers/gpu/drm/tests/drm_client_modeset_test.c
+++ b/drivers/gpu/drm/tests/drm_client_modeset_test.c
@@ -59,7 +59,8 @@ static int drm_client_modeset_test_init(struct kunit *test)
 
        test->priv = priv;
 
-       priv->drm = drm_kunit_device_init(test, DRIVER_MODESET, "drm-client-modeset-test");
+       priv->drm = drm_kunit_helper_alloc_drm_device(test, DRIVER_MODESET,
+                                                     "drm-client-modeset-test");
        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 4fe1311417185bace9731109a738c2d4336261f0..e718073ba6e9a42cab6929a7b0836ddf7c878567 100644 (file)
--- a/drivers/gpu/drm/tests/drm_kunit_helpers.c
+++ b/drivers/gpu/drm/tests/drm_kunit_helpers.c
@@ -36,7 +36,7 @@ static void dev_free(struct kunit_resource *res)
 }
 
 /**
- * drm_kunit_device_init - Allocates a mock DRM device for KUnit tests
+ * 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
@@ -52,7 +52,9 @@ static void dev_free(struct kunit_resource *res)
  * Returns:
  * A pointer to the new drm_device, or an ERR_PTR() otherwise.
  */
-struct drm_device *drm_kunit_device_init(struct kunit *test, u32 features, char *name)
+struct drm_device *
+drm_kunit_helper_alloc_drm_device(struct kunit *test,
+                                 u32 features, char *name)
 {
        struct kunit_dev *kdev;
        struct drm_device *drm;
@@ -82,7 +84,7 @@ struct drm_device *drm_kunit_device_init(struct kunit *test, u32 features, char
 
        return drm;
 }
-EXPORT_SYMBOL_GPL(drm_kunit_device_init);
+EXPORT_SYMBOL_GPL(drm_kunit_helper_alloc_drm_device);
 
 MODULE_AUTHOR("Maxime Ripard <maxime@cerno.tech>");
 MODULE_LICENSE("GPL");

diff --git a/drivers/gpu/drm/tests/drm_modes_test.c b/drivers/gpu/drm/tests/drm_modes_test.c
index 3953e478c4d01c1a60fe5a2f2f7387943796bc7c..6723089dff9fbb67f4849860522e744b44da17c0 100644 (file)
--- a/drivers/gpu/drm/tests/drm_modes_test.c
+++ b/drivers/gpu/drm/tests/drm_modes_test.c
@@ -22,7 +22,8 @@ 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_device_init(test, DRIVER_MODESET, "drm-modes-test");
+       priv->drm = drm_kunit_helper_alloc_drm_device(test, DRIVER_MODESET,
+                                                     "drm-modes-test");
        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 6b3b7d0f948efd262b633a1dfbb51e1cde5b083f..b44768100ed5dfb7aead95bc0396d46e44e984a3 100644 (file)
--- a/drivers/gpu/drm/tests/drm_probe_helper_test.c
+++ b/drivers/gpu/drm/tests/drm_probe_helper_test.c
@@ -39,8 +39,9 @@ static int drm_probe_helper_test_init(struct kunit *test)
        KUNIT_ASSERT_NOT_NULL(test, priv);
        test->priv = priv;
 
-       priv->drm = drm_kunit_device_init(test, DRIVER_MODESET | DRIVER_ATOMIC,
-                                         "drm-probe-helper-test");
+       priv->drm = drm_kunit_helper_alloc_drm_device(test,
+                                                     DRIVER_MODESET | DRIVER_ATOMIC,
+                                                     "drm-probe-helper-test");
        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 20ab6eec4c89112b722a807df35ef61da3b3c7bf..e9870c7911fe2c746777b5e76180ccd5a577c0ab 100644 (file)
--- a/include/drm/drm_kunit_helpers.h
+++ b/include/drm/drm_kunit_helpers.h
@@ -6,6 +6,9 @@
 struct drm_device;
 struct kunit;
 
-struct drm_device *drm_kunit_device_init(struct kunit *test, u32 features, char *name);
+struct drm_device *
+drm_kunit_helper_alloc_drm_device(struct kunit *test,
+                                 u32 features,
+                                 char *name);
 
 #endif // DRM_KUNIT_HELPERS_H_