From nobody Sun Feb 8 05:41:50 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 40FF9EB64DD for ; Fri, 23 Jun 2023 10:17:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232069AbjFWKRz (ORCPT ); Fri, 23 Jun 2023 06:17:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56724 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231680AbjFWKRR (ORCPT ); Fri, 23 Jun 2023 06:17:17 -0400 Received: from out-59.mta0.migadu.com (out-59.mta0.migadu.com [91.218.175.59]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0B3D1987 for ; Fri, 23 Jun 2023 03:17:06 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1687514925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cp/dioA/Px4isvqDry6K9lCTQWmXUioxU/Gzve54Hpc=; b=vC9134FYF29pSWqPRpQB9uDXrqIMd8A/Jlstt4sPbCM2Truov/UzIMrO/vnZZ7JtKW4oi0 36rs70bROZZRiiWtgsMADXAY1qkL+niG400xBeXUrFXVkCnnKLjcRgb66C1itM0zOm/9zo A2Q5k5aR6o7136tFzuqpR/+hBNcsedw= From: Sui Jingfeng To: Lucas Stach , Russell King , Christian Gmeiner , David Airlie , Daniel Vetter Cc: etnaviv@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, loongson-kernel@lists.loongnix.cn, Sui Jingfeng Subject: [PATCH v1 7/8] drm/etnaviv: Add dedicated functions to create and destroy platform device Date: Fri, 23 Jun 2023 18:08:21 +0800 Message-Id: <20230623100822.274706-8-sui.jingfeng@linux.dev> In-Reply-To: <20230623100822.274706-1-sui.jingfeng@linux.dev> References: <20230623100822.274706-1-sui.jingfeng@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT 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 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. 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 14c2e9690ce1..7d0eeab3e8b7 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c @@ -655,12 +655,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(); @@ -680,23 +712,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 @@ -712,7 +734,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