[PATCH v3 3/6] drm/etnaviv: add dedicate functions to create and destroy platform device

From: Sui Jingfeng
Date: Wed Mar 29 2023 - 16:52:05 EST


From: Sui Jingfeng <suijingfeng@xxxxxxxxxxx>

Also rename the virtual master device as etnaviv_platform_device, for
better reflection that it is a platform device, not the drm device control
structure. Another benefit is that we no longer need to call of_node_put()
for three different case. Instead, we only need call it once.

Signed-off-by: Sui Jingfeng <suijingfeng@xxxxxxxxxxx>
---
drivers/gpu/drm/etnaviv/etnaviv_drv.c | 56 +++++++++++++++++++--------
1 file changed, 39 insertions(+), 17 deletions(-)

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
index 44ca803237a5..ce0537af80bd 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
@@ -697,12 +697,44 @@ static struct platform_driver etnaviv_platform_driver = {
},
};

-static struct platform_device *etnaviv_drm;
+static struct platform_device *etnaviv_platform_device;

-static int __init etnaviv_init(void)
+static int etnaviv_create_platform_device(const char *name,
+ struct platform_device **ppdev)
{
struct platform_device *pdev;
int ret;
+
+ pdev = platform_device_alloc(name, PLATFORM_DEVID_NONE);
+ if (!pdev)
+ return -ENOMEM;
+
+ ret = platform_device_add(pdev);
+ if (ret) {
+ platform_device_put(pdev);
+ return ret;
+ }
+
+ *ppdev = pdev;
+
+ return 0;
+}
+
+static void etnaviv_destroy_platform_device(struct platform_device **ppdev)
+{
+ struct platform_device *pdev = *ppdev;
+
+ if (!pdev)
+ return;
+
+ *ppdev = NULL;
+
+ platform_device_unregister(pdev);
+}
+
+static int __init etnaviv_init(void)
+{
+ int ret;
struct device_node *np;

etnaviv_validate_init();
@@ -723,22 +755,12 @@ static int __init etnaviv_init(void)
if (!of_device_is_available(np))
continue;

- pdev = platform_device_alloc("etnaviv", PLATFORM_DEVID_NONE);
- if (!pdev) {
- ret = -ENOMEM;
- of_node_put(np);
- goto unregister_platform_driver;
- }
-
- ret = platform_device_add(pdev);
- if (ret) {
- platform_device_put(pdev);
- of_node_put(np);
+ ret = etnaviv_create_platform_device("etnaviv",
+ &etnaviv_platform_device);
+ of_node_put(np);
+ if (ret)
goto unregister_platform_driver;
- }

- etnaviv_drm = pdev;
- of_node_put(np);
break;
}

@@ -754,7 +776,7 @@ module_init(etnaviv_init);

static void __exit etnaviv_exit(void)
{
- platform_device_unregister(etnaviv_drm);
+ etnaviv_destroy_platform_device(&etnaviv_platform_device);
platform_driver_unregister(&etnaviv_platform_driver);
platform_driver_unregister(&etnaviv_gpu_driver);
}
--
2.25.1