From:   Bernard Zhao <bernard@vivo.com>
To:     Alex Deucher <alexander.deucher@amd.com>,
        =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>,
        "Pan, Xinhui" <Xinhui.Pan@amd.com>,
        David Airlie <airlied@linux.ie>,
        Daniel Vetter <daniel@ffwll.ch>,
        Candice Li <candice.li@amd.com>, Monk liu <monk.liu@amd.com>,
        John Clements <john.clements@amd.com>,
        Jingwen Chen <Jingwen.Chen2@amd.com>,
        Bernard Zhao <bernard@vivo.com>,
        Peng Ju Zhou <PengJu.Zhou@amd.com>,
        Jiawei Gu <Jiawei.Gu@amd.com>,
        Bokun Zhang <bokun.zhang@amd.com>,
        Zhigang Luo <zhigang.luo@amd.com>,
        Lee Jones <lee.jones@linaro.org>,
        amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH v2] drm/amd/amdgpu: cleanup the code style a bit
Date:   Mon, 15 Nov 2021 04:09:06 -0800
Message-Id: <20211115120910.10318-1-bernard@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wawszkg05A9HJmNnoppocE7tK3gsZ7ZkdrpEZz57+zE7TL7evjnawIRSy6D6?=
 =?us-ascii?Q?eIC7m/UMkS7A7Ej7qE7piysPpuQ59gB65diRF3Z8yiZT4jJ75s+9BfmdQJWI?=
 =?us-ascii?Q?JK7nFSX31ItyKu9WQ5Lp8d1yPpndIzmRwC4ysCz3ZMXNfiM12eJoQs4qTUQJ?=
 =?us-ascii?Q?h+HYk6hPJWo8sWUpXYHuOeKK9m6j2QJeYVdGjeZPu6UstLiMkfc9AzLgm2KT?=
 =?us-ascii?Q?db6wYEiQMH272AZjhSd5iPAtSd53sfnANIr0OgrTfQigbpZRTKPHTEZQTJHa?=
 =?us-ascii?Q?dY8OVaJvcSE0jyVTn8oGuIjK4S6YyWWdd9lRy0vRssVoRGHkeWWTZuPbJWYT?=
 =?us-ascii?Q?8+FTsEgiO7WBhn4/3+WC4RMp65kZuoZdaFsATrYXtakqgVGkH89iNuTD01Ju?=
 =?us-ascii?Q?eK3PXX+P+WRC34SBcY/OrSoxRvj9TvSukRQdskWzEIxzBRcjGTppE/DBRPqz?=
 =?us-ascii?Q?C8NN+phGjsLiTE1UhfWXNh+IlcILuhVOPWGda8Kjl2JkrSRf7k7yvfkN/GwG?=
 =?us-ascii?Q?pmqfp6VCJpF2m1gyPxGXQKWKCDChpxCEzPm0O9UOlxyVB8glysNU0hI4l+4/?=
 =?us-ascii?Q?D42yt8ClPhDZc/6BIIfBoGEO+JKgrA5qp61GH7G0AvWZXaKQADofxEH2VBXM?=
 =?us-ascii?Q?DfTInp7Sb5N5IAwhCVDWEP4aJNyRH2+qcdztIierixiOY7/ofqAtoqNcdGyF?=
 =?us-ascii?Q?eliSl/EEPWQhA9DIr0W1DFVx40Hv+V/CoPu45577PqO34ePjMNylQQjyuM0V?=
 =?us-ascii?Q?7NsCldXD53umNSO1O1y1vQSeid5Mq5/KNZk/1YACCHbwQqi4+xfB2nlunn6V?=
 =?us-ascii?Q?3eWW8IjgSbCCde/n0mbSzNyLqCUNwMxq4eWcO2+WF85XJT9YeSDKxQ2cUBTM?=
 =?us-ascii?Q?6rcHhsY+p/iyWB/nNuaw5q6gye63Iks46gjUgG4nRxV2Orv2bvNVAKzGQaF4?=
 =?us-ascii?Q?7vVvqTahNYJ/P1yeTMnK3gX7mEsZiFf5M3fBgQJPmO/UBMS/fZPAt9rRq3Dl?=
 =?us-ascii?Q?JHaZjQVkmcxNpA3XW9Sbdqk84o5PG1YpKu8nZZ0NHm7tIwhWnK7Im0pZaIFE?=
 =?us-ascii?Q?zy6fApSzeSl9Bae8qPgeygJLsnBq14xsViPFRH8LNv7ziR2Q5kVezAsPSqiR?=
 =?us-ascii?Q?DU6Rp3e5ygoVRr1ytkwyqo5+OXr55HKDokx8gSexQVZn9xc6XNCLSsfq6/OU?=
 =?us-ascii?Q?2vdf8hAJ2xh6Ey3ds1QZyFi4Z6rdLkES/dX1E45pI10g55K1e4vJ3FEqE8Tv?=
 =?us-ascii?Q?E4nqq0vsYO1VHJEViNJxZnn5RgLDkxwkmJ1flLYeVLQsHzx2guzr4jh7CRwi?=
 =?us-ascii?Q?eJkTFUjsoGBbDuquTjLurFKFx36Zj48GnA4+3o13usmEjeNBug6BOjhLgBdi?=
 =?us-ascii?Q?7iiRABK1Pk7Lu9+vIR2N/2tMaC07hYQkbJDRu2VK2el0OEKEbo657NCtYtR4?=
 =?us-ascii?Q?Ugr/fsN2Nu8jJn7r6KfHTdGiq5t5WQv0IDaLbfq8rPxklYrvBavQ3EWZ5MQP?=
 =?us-ascii?Q?4kl976aQJ5wqUj+C1CcwBPTvbzdAR81a4qqcKmzOemrHeqs4TWx09DBbClPv?=
 =?us-ascii?Q?M+k9o/Ja6z+7HA+upYfx4lX8I2qZSGYvqyiCOfEl7BXzi2i4+8YT2oMzcU4L?=
 =?us-ascii?Q?FPzR0KDjWdl7tjWFal6oqsk=3D?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 90b01482-82d4-4fc9-0562-08d9a830c139
X-MS-Exchange-CrossTenant-AuthSource: PSAPR06MB4021.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Nov 2021 12:09:20.5313
 (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: 9zcMYS9//lNa7Sc4FS+TmyCz84SUGBV3bxnLQDBbM27/Zha5INis+dSx4pJ2voXh7gEhO2XqiGBv6Znw7QOryA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PSAPR06MB4199
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

This change is to cleanup the code style a bit.

Signed-off-by: Bernard Zhao <bernard@vivo.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
index 04cf9b207e62..3fc49823f527 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
@@ -283,17 +283,15 @@ static int amdgpu_virt_init_ras_err_handler_data(struct amdgpu_device *adev)
 
 	*data = kmalloc(sizeof(struct amdgpu_virt_ras_err_handler_data), GFP_KERNEL);
 	if (!*data)
-		return -ENOMEM;
+		goto data_failure;
 
 	bps = kmalloc_array(align_space, sizeof((*data)->bps), GFP_KERNEL);
-	bps_bo = kmalloc_array(align_space, sizeof((*data)->bps_bo), GFP_KERNEL);
+	if (!bps)
+		goto bps_failure;
 
-	if (!bps || !bps_bo) {
-		kfree(bps);
-		kfree(bps_bo);
-		kfree(*data);
-		return -ENOMEM;
-	}
+	bps_bo = kmalloc_array(align_space, sizeof((*data)->bps_bo), GFP_KERNEL);
+	if (!bps_bo)
+		goto bps_bo_failure;
 
 	(*data)->bps = bps;
 	(*data)->bps_bo = bps_bo;
@@ -303,6 +301,13 @@ static int amdgpu_virt_init_ras_err_handler_data(struct amdgpu_device *adev)
 	virt->ras_init_done = true;
 
 	return 0;
+
+bps_bo_failure:
+	kfree(bps);
+bps_failure:
+	kfree(*data);
+data_failure:
+	return -ENOMEM;
 }
 
 static void amdgpu_virt_ras_release_bp(struct amdgpu_device *adev)
-- 
2.33.1