From nobody Mon Feb 9 16:17:56 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 10151EB64D7 for ; Tue, 20 Jun 2023 09:48:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232421AbjFTJsD (ORCPT ); Tue, 20 Jun 2023 05:48:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231282AbjFTJsA (ORCPT ); Tue, 20 Jun 2023 05:48:00 -0400 Received: from m12.mail.163.com (m12.mail.163.com [220.181.12.215]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id D6497F4 for ; Tue, 20 Jun 2023 02:47:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=I036I OlE47YU/zkCBkHIDjqcQBQLJoAnED19i/4kJrc=; b=jqTV1TiL3ER4HDKd+6fsr dzdoNO5IMCPeNkx3tOuey093SkfVxOaU3N0ZSmm58wtyntyTd/HpYhUdm6otWEfV 1R5mK6nCAASNyCpFDM5SaFw1Rl98AXruEoRhSJrxi8X3Dz0s02MGAaZeJnd5vAw0 KF69CQ7JbI/oVaFcXo9Jnk= Received: from openarena.loongson.cn (unknown [114.242.206.180]) by zwqz-smtp-mta-g4-0 (Coremail) with SMTP id _____wAXg3CldZFkB8yiAQ--.11241S5; Tue, 20 Jun 2023 17:47:18 +0800 (CST) From: Sui Jingfeng <18949883232@163.com> To: Lucas Stach , Russell King , Christian Gmeiner , David Airlie , Daniel Vetter Cc: linux-kernel@vger.kernel.org, etnaviv@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Sui Jingfeng , Philipp Zabel , Bjorn Helgaas Subject: [PATCH v10 03/11] drm/etnaviv: Add dedicated functions to create and destroy platform device Date: Tue, 20 Jun 2023 17:47:08 +0800 Message-Id: <20230620094716.2231414-4-18949883232@163.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230620094716.2231414-1-18949883232@163.com> References: <20230620094716.2231414-1-18949883232@163.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: _____wAXg3CldZFkB8yiAQ--.11241S5 X-Coremail-Antispam: 1Uf129KBjvJXoWxAr4fWF17JFW3ur17GFy3Arb_yoW5ArW8pF 47GFWSyrW8WFW7Kw1xJrn8ZFW5C3WSg34F9rnFywnF9398Ar98XF95JFyUAFnxJFWrGa1r trn8tF4xuF45ZrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07bU3ktUUUUU= X-Originating-IP: [114.242.206.180] X-CM-SenderInfo: jprymkizyyjjits6il2tof0z/1tbiEwmU0WE17eMXkQAEsH Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Sui Jingfeng Also rename the virtual master platform device as etnaviv_platform_device, for better reflection that it is a platform device, not a DRM device. Another benefit is that we no longer need to call of_node_put() for three different cases, Instead, we only need to call it once. Cc: Lucas Stach Cc: Christian Gmeiner Cc: Philipp Zabel Cc: Bjorn Helgaas Cc: Daniel Vetter Signed-off-by: Sui Jingfeng --- 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/etnavi= v/etnaviv_drv.c index 31a7f59ccb49..cec005035d0e 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c @@ -656,12 +656,44 @@ static struct platform_driver etnaviv_platform_driver= =3D { }, }; =20 -static struct platform_device *etnaviv_drm; +static struct platform_device *etnaviv_platform_device; =20 -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 =3D platform_device_alloc(name, PLATFORM_DEVID_NONE); + if (!pdev) + return -ENOMEM; + + ret =3D platform_device_add(pdev); + if (ret) { + platform_device_put(pdev); + return ret; + } + + *ppdev =3D pdev; + + return 0; +} + +static void etnaviv_destroy_platform_device(struct platform_device **ppdev) +{ + struct platform_device *pdev =3D *ppdev; + + if (!pdev) + return; + + platform_device_unregister(pdev); + + *ppdev =3D NULL; +} + +static int __init etnaviv_init(void) +{ + int ret; struct device_node *np; =20 etnaviv_validate_init(); @@ -681,23 +713,13 @@ static int __init etnaviv_init(void) for_each_compatible_node(np, NULL, "vivante,gc") { if (!of_device_is_available(np)) continue; + of_node_put(np); =20 - pdev =3D platform_device_alloc("etnaviv", PLATFORM_DEVID_NONE); - if (!pdev) { - ret =3D -ENOMEM; - of_node_put(np); - goto unregister_platform_driver; - } - - ret =3D platform_device_add(pdev); - if (ret) { - platform_device_put(pdev); - of_node_put(np); + ret =3D etnaviv_create_platform_device("etnaviv", + &etnaviv_platform_device); + if (ret) goto unregister_platform_driver; - } =20 - etnaviv_drm =3D pdev; - of_node_put(np); break; } =20 @@ -713,7 +735,7 @@ module_init(etnaviv_init); =20 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); } --=20 2.25.1