From patchwork Thu Sep 5 10:20:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Yufan X-Patchwork-Id: 13792129 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 54DFDCD5BA7 for ; Thu, 5 Sep 2024 10:22:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 98AB010E84F; Thu, 5 Sep 2024 10:22:51 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=vivo.com header.i=@vivo.com header.b="q0Mtd8A2"; dkim-atps=neutral Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01on2050.outbound.protection.outlook.com [40.107.215.50]) by gabe.freedesktop.org (Postfix) with ESMTPS id 317DD10E84F; Thu, 5 Sep 2024 10:22:48 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=tFl//SkxHEGhH1JUy5JIvCa2WKDHLJwv6vFoOvKJ4te0YU2VwQ54GpDNh868beViyKwytA16uelB8EFSP8LCicKDXUO+vjTckhLC7gRYbCjq45jebWiklASW9F0fj1zlW/bQ41KorU+tUHzs8deGewZQJ0bligLh9HYQrP9ay/yGz7QCpnarSUEi/ytHnLgslO/9HMHvPd7jwNEo09ikHH98wcB8vi85kJQ9i6TilS6HSUOBVXsFFl0hkaoTegRH6S+5eZDip3eMzey5l3wWaxZQjNYwK2JxDY3qcEq4z3oM6vhWgZ8kbaR9By0HMGjowYt+Lny9jwZDAQuH5aNX5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=rEPKNvrGwgQfwdsWCzQOaciZOOWDsFnQkygZIlbvb2w=; b=RY/D5KRftE1eQN/tENc2l2RUYfznrb0V8sFs6f9fKJE3xh3lFBv8yBrKYMUoiSJ7A+PJkAhJ2GTva/TUao2p3m8GYKhZFWf7HAe7BjcQEk0y+lVLsfGQ2myPxLP/hwzOccrZQ3MiIcWk3VoiJ9K6qPYWf/O0qBM1NLVG6il7HP5U+D4CXcwmE/h5onLo/OjmgwTW8S4RRF9zE2Ioi1vIQ3Oh4JIp88qtOjSbQ+bA+tZKisgG3+e8qr7p+70MqyoVQWwfqzffiL0C0ocR9bBdNn/iV2EFmjMpgc5PVjXT8az/uWXL/asMJwUIydaJTh50dznVEp0doVGqqq0/bksN3A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rEPKNvrGwgQfwdsWCzQOaciZOOWDsFnQkygZIlbvb2w=; b=q0Mtd8A2jnEpgMIT3d2wYJAMVnSKvqNDgfou91HeiBz2es2cQ5oApj9tFCDrjiMhGsQzf+Gwiuz/ayyp06PO8MIAHb2sS4/HgOZ8Cn2CdmGA9Pi4Q9R4+j0rpVsNPzoIYYBZXZrfEXroCB1IbddOjw+e4DgHa0dIoTHt8yj5mDCpn3QSHQ9iYJlcKHLpzz79ZPxocu6+NRbksBPS8XyeNT0I1hnqTL02qviGWrPKmxpRcQ2r45E9Zeqhw2vjlXDHennEQwMolps7X8IpVp9+/l3Zr1/SgqJZaXJiv5qCDr5aCh4vUY0GfEMOZV1T9JAPcWxii2Vni+zPAuDbdLtFgA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from KL1PR0601MB5487.apcprd06.prod.outlook.com (2603:1096:820:bf::14) by KL1PR06MB6865.apcprd06.prod.outlook.com (2603:1096:820:10d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.28; Thu, 5 Sep 2024 10:22:42 +0000 Received: from KL1PR0601MB5487.apcprd06.prod.outlook.com ([fe80::2129:59e5:6c67:311f]) by KL1PR0601MB5487.apcprd06.prod.outlook.com ([fe80::2129:59e5:6c67:311f%7]) with mapi id 15.20.7918.024; Thu, 5 Sep 2024 10:22:42 +0000 From: Chen Yufan To: Karol Herbst , Lyude Paul , Danilo Krummrich , David Airlie , Simona Vetter , Dave Airlie , Ben Skeggs , Chen Yufan , dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: opensource.kernel@vivo.com Subject: [PATCH v1] drm/nouveau/nvkm: Convert to use ERR_CAST() Date: Thu, 5 Sep 2024 18:20:30 +0800 Message-Id: <20240905102106.85283-1-chenyufan@vivo.com> X-Mailer: git-send-email 2.39.0 X-ClientProxiedBy: SI2PR02CA0027.apcprd02.prod.outlook.com (2603:1096:4:195::14) To KL1PR0601MB5487.apcprd06.prod.outlook.com (2603:1096:820:bf::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: KL1PR0601MB5487:EE_|KL1PR06MB6865:EE_ X-MS-Office365-Filtering-Correlation-Id: 9d45c253-538f-41e8-29fa-08dccd94ad23 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|366016|376014|7416014|52116014|921020|38350700014; X-Microsoft-Antispam-Message-Info: E/HLgOVB3RFI3qxHgUcFk+N/LOD/kx8ywYsyE3iJIy/oXSkKfOEwe6cq9u/dzIf2aim0MJ5HEvDIRj7OzMLWjxKacxrmGYDzqOTNptmec6YWtMZbYUJ/HqR1z1Ek9bcBuSZm8kEBx8/GShiBmtXaErRs+RHwiHuAsB44AqwSMkDU9UWB3E82HLF1SBc/RRFywB+G6oP62TyGN7/CFeg33qjBTdWAh/WcxqaPTDrDLQeL3WZI6Lni1xAKW4q+Fl94ll9HUyyz/kXFHdj+lMhrx+CX0fShJCEcuCFpDU0+RoDKoNJAsoJe7q8cpHagTx4hD2l0qobVlAGhfilAU9m6E7D9uZqZsp5Um3qNrLirJYvsD7vyr4ZVTRVea4MLFY9hRRbAXLsmRkZTkUD9MwNxCkPn0ltcSamu5mmXeI1025l8WENqdbPZgEAyBDxpgXOuczUQTh+J3+h3mrqFIBkVXg1l4s8LqiZdBOTA7O0Pfcq8k/Z9Ni4ek6EAwvEzDDXV21EvVIc1utALwUT81oHbWdtbxmHr3rxx6GhNTvoPrUgkBfKfzo7CKt7TBzgS3i3yLnN3iAGFi7ZEkl+ShDeO1Lu/boEDYNR5FAD/9yA+y5lhPRGvnXMoGGAoRLlUAwq0JKUAOgQDVnt5z67hNff2qI1FKmaTqTwi0Omd3iDb3sVuWqfj+v+WrvLEiqja8Maa8Fowg76fH0gdmFQgPOfoD7GXq4w10utbZpDHz7P3RckLeXynLYv2fOkkgaMdAq0sL9OPndc17WiOVU4aaPW2bUxJsmuVyaOzeUKGwdNwEkQov8k4NMaMCCSXe7JLLvdmXSDWBD7HJYFM/QsT5NVaYhH4MX5vi5EBMOcAxWXZg38pTgkLJK8wbSG8tRJ+35Sj5Fho+JLBxlF8dVdTeep7DjZyYeYi2UJz+txnUIsBY472FLI9gMQa3lstafG13onU3uRFZo9lOxMkq/1F6Dmq8cbmsGqI4ANT807A3EgV5DrCcSTlRQ6MP9jBUPxO6K8YffknCDS71o42b2E5I/1tYhcgxszlyoK6QgP0KJw6GPhI8SIP7njdGdHHzOm310zefl9njl5aQeGL1fI5H7QvapNOu82skaIiIdhBs48kuMYxxMIYyAgNImxOdJMY/sV9Oxuh3HZ+rNr5kQlYKDc9Q/+ypAYK31m2NCNh1RRwfkFWldrsAlynOpkbzhi53zeZWQvdLFD5pu29GiLM11MWYFAtaaBghai39ZE72Dzr7ANmydpfPPIBOzWk8DVfS1+QOSzPp6MSuKfyGlB6f1s14WPGAdwEA/y3LIjj2zPjKUrpreToTewmmLluw5KhwgugtwFO17ZLQ70D21ZwvaFs2bSA+S5Vl9v+r5JH2SWFD+C7yaT6PrLqCOmHmBtiRONYJDLTXwLYrvTpLh/tn5SwWMUk5UuztHkw+i9jn9CJo+g= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:KL1PR0601MB5487.apcprd06.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(376014)(7416014)(52116014)(921020)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LhieTlWAvuVblEfWjoUrQbR0boAIeokbni4e+ojvHww31bfuOJ/xjKOdaE2HpXb1YwNN3OR3bjSwZ/OpyLnNOw4Ug+I+e1wDO54Iy8CqAezUNjra+xmUF56haz9jyEcjjdDgFRzO1UEUjgzN+9w58T30W+5fZDnzY9wBV/F/ruMAiXw1Cw2vsZxr3OudYZan3ad6nSxx7ZFmgICi9w3o46dYCfDL0jdF+9Ce3iJTY6Xn+OEIIAtfZ8N63r0wL8vw0+A386CcHc1P/nNGYzKVZQRSPiZ6HM7jUQLE0uYYB2NomAE5/ybfJbuzcu6vSXO0fuMvMMVBRl2rNiqkqnJRgGP6Ph5Ja4XpyKDMA3pVDYxKsgyGVL/gMqMsGZsW+IEq2TSGzYFhCt9hbQl6gDDi7yshi0fN8F/TgLrgeEO5EcOPBcHqct4FZyy/GophX6ToI+xkrBeVeWikHfpap1h2bjcSHzT+TN4DA1kwgpsCRuPK+y/Afy1/Fj8BwzLiWsD0bcqOMBvXaygMIJ7Pzoy8tSjsWJyPzg8wsEEM011lRhMUhmxIbLKY0T8YC8bhr7L+UjYDuMEZ3Z71mUj13O9Rg/FrYTkSAYUDKvMtcXghvQEn4AVUyDks8SZj3qBBRyXzrd1toDw6SY4kEN8ClBqKCq0SWXqX2eFTtFMA483WoWXcGrANSwYr5CAkmlhqFtTk6iQGv7O9PuSKU6Xf/RrmzrS0RQWUROOiaNnM4x+E8rvNwzJN55E1lcHhIW22XmyD/Lhv5vgtTX+EaQH2RBHRI2B8OBXH2+we7wXDKI07LumQd8AbFWQIWK8YluZbLHWcvD54mOjbXlu6OhaP3Kdgd9RfCef1gkv6tb9H69ylpG8MBCQSd38OJg9Q4OmZTfac4n5vmL97MXAeVb2Lfp2ENWNZ5gv9EEn2tTfUDIHU2r8u1U2dyFOsZGlKfksAVLNwxZa9C6zBtLKInHgQ3HUJZfz9Fkb6jL9EErDrpiz2XP/QDPqZwG9DuMLuj1RX7dZ2DH7qmgCySL+T7CODw5VyYqkhzAa3lSthM6t/oteBws0a1rXZpbKM2J6UDd5UadWIGRs8YA8FencNLXsoMGADMGFd+7Gnfw1jeRiez4okP3Cq66KKAmedQ4TCDZiWOeaCMYJjH9HCu1KJx1/ajgA6aPuKePuMbClSdBdkbcXuFr3ug3HE4jrv5t0zlDY1pIvQ88F5ypYRAnIXx53jmXz2c/qAi0/AKp3qmV2NiKhQhgDOTm/HQ1/GOI01PsfOAsaBXhbnBvfjdyV8LB1JBYSrn7w/dauzwf2vknSdePqHrbmbqaARdSqukXPEdhyyQzW69xaGGh93nFjn49J/TUSa7+F3n2VatTmJ49q6fzsICXAQd0ht54QmrpIvZTLQzdoLac3lQtEzzgc0y4qi2SxT/W+DUUWs7k31sO7JEaOEdd6YBOVIPBXB7fW4H+ptjUH1nAJcoEv+S36UOVR8VprWSqFVxxAvpvEZBDmlm2Ey3IVimYJ9H85XDR/F7ZWqABZgGgkTc31j1j9Rt8ffbhR+0Kg7SE7JrLJkkh8TBONxKBWMHYt8e6gQMomBdtvv9bTp X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9d45c253-538f-41e8-29fa-08dccd94ad23 X-MS-Exchange-CrossTenant-AuthSource: KL1PR0601MB5487.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Sep 2024 10:22:42.5416 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 5i7fUO9tLGfW87ZfvlYsgYmtBX0Sz+m+HrRQYAfUFvblQGarBn/xpl8DJDj6TleC5s/4cogXH94NriM1C9yWJw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR06MB6865 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Instead of directly casting and returning (void *) pointer, use ERR_CAST to explicitly return an error-valued pointer. This makes the error handling more explicit and improves code clarity. Signed-off-by: Chen Yufan --- drivers/gpu/drm/nouveau/nvkm/engine/disp/r535.c | 2 +- drivers/gpu/drm/nouveau/nvkm/engine/dma/user.c | 2 +- drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/r535.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/r535.c index 027867c2a8c5..266857ace7c7 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/r535.c @@ -646,7 +646,7 @@ r535_conn_new(struct nvkm_disp *disp, u32 id) ctrl = nvkm_gsp_rm_ctrl_get(&disp->rm.objcom, NV0073_CTRL_CMD_SPECIFIC_GET_CONNECTOR_DATA, sizeof(*ctrl)); if (IS_ERR(ctrl)) - return (void *)ctrl; + return ERR_CAST(ctrl); ctrl->subDeviceInstance = 0; ctrl->displayId = BIT(id); diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/dma/user.c b/drivers/gpu/drm/nouveau/nvkm/engine/dma/user.c index 797131ed7d67..ef02e61dda0c 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/dma/user.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/dma/user.c @@ -38,7 +38,7 @@ nvkm_dmaobj_search(struct nvkm_client *client, u64 handle) object = nvkm_object_search(client, handle, &nvkm_dmaobj_func); if (IS_ERR(object)) - return (void *)object; + return ERR_CAST(object); return nvkm_dmaobj(object); } diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c index cf490ff2b9f1..c45914f30c3d 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c @@ -37,7 +37,7 @@ nvkm_uvmm_search(struct nvkm_client *client, u64 handle) object = nvkm_object_search(client, handle, &nvkm_uvmm); if (IS_ERR(object)) - return (void *)object; + return ERR_CAST(object); return nvkm_vmm_ref(nvkm_uvmm(object)->vmm); }