Skip to content

Commit 519424d

Browse files
Bernard Zhaoalexdeucher
authored andcommitted
drm/radeon: delete useless function return values & remove meaningless if(r) check code
Function radeon_fence_driver_init always returns success, the function type maybe coule be changed to void. This patch first delete the check of the return value of the function call radeon_fence_driver_init, then, optimise the function declaration and function to void type. Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Bernard Zhao <bernard@vivo.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent a7268cf commit 519424d

16 files changed

Lines changed: 16 additions & 48 deletions

File tree

drivers/gpu/drm/radeon/cik.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8584,9 +8584,7 @@ int cik_init(struct radeon_device *rdev)
85848584
radeon_get_clock_info(rdev->ddev);
85858585

85868586
/* Fence driver */
8587-
r = radeon_fence_driver_init(rdev);
8588-
if (r)
8589-
return r;
8587+
radeon_fence_driver_init(rdev);
85908588

85918589
/* initialize memory controller */
85928590
r = cik_mc_init(rdev);

drivers/gpu/drm/radeon/evergreen.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5208,9 +5208,7 @@ int evergreen_init(struct radeon_device *rdev)
52085208
/* Initialize clocks */
52095209
radeon_get_clock_info(rdev->ddev);
52105210
/* Fence driver */
5211-
r = radeon_fence_driver_init(rdev);
5212-
if (r)
5213-
return r;
5211+
radeon_fence_driver_init(rdev);
52145212
/* initialize AGP */
52155213
if (rdev->flags & RADEON_IS_AGP) {
52165214
r = radeon_agp_init(rdev);

drivers/gpu/drm/radeon/ni.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2375,9 +2375,7 @@ int cayman_init(struct radeon_device *rdev)
23752375
/* Initialize clocks */
23762376
radeon_get_clock_info(rdev->ddev);
23772377
/* Fence driver */
2378-
r = radeon_fence_driver_init(rdev);
2379-
if (r)
2380-
return r;
2378+
radeon_fence_driver_init(rdev);
23812379
/* initialize memory controller */
23822380
r = evergreen_mc_init(rdev);
23832381
if (r)

drivers/gpu/drm/radeon/r100.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4056,9 +4056,7 @@ int r100_init(struct radeon_device *rdev)
40564056
/* initialize VRAM */
40574057
r100_mc_init(rdev);
40584058
/* Fence driver */
4059-
r = radeon_fence_driver_init(rdev);
4060-
if (r)
4061-
return r;
4059+
radeon_fence_driver_init(rdev);
40624060
/* Memory manager */
40634061
r = radeon_bo_init(rdev);
40644062
if (r)

drivers/gpu/drm/radeon/r300.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1549,9 +1549,7 @@ int r300_init(struct radeon_device *rdev)
15491549
/* initialize memory controller */
15501550
r300_mc_init(rdev);
15511551
/* Fence driver */
1552-
r = radeon_fence_driver_init(rdev);
1553-
if (r)
1554-
return r;
1552+
radeon_fence_driver_init(rdev);
15551553
/* Memory manager */
15561554
r = radeon_bo_init(rdev);
15571555
if (r)

drivers/gpu/drm/radeon/r420.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -425,10 +425,7 @@ int r420_init(struct radeon_device *rdev)
425425
r300_mc_init(rdev);
426426
r420_debugfs(rdev);
427427
/* Fence driver */
428-
r = radeon_fence_driver_init(rdev);
429-
if (r) {
430-
return r;
431-
}
428+
radeon_fence_driver_init(rdev);
432429
/* Memory manager */
433430
r = radeon_bo_init(rdev);
434431
if (r) {

drivers/gpu/drm/radeon/r520.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -299,9 +299,7 @@ int r520_init(struct radeon_device *rdev)
299299
r520_mc_init(rdev);
300300
rv515_debugfs(rdev);
301301
/* Fence driver */
302-
r = radeon_fence_driver_init(rdev);
303-
if (r)
304-
return r;
302+
radeon_fence_driver_init(rdev);
305303
/* Memory manager */
306304
r = radeon_bo_init(rdev);
307305
if (r)

drivers/gpu/drm/radeon/r600.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3282,9 +3282,7 @@ int r600_init(struct radeon_device *rdev)
32823282
/* Initialize clocks */
32833283
radeon_get_clock_info(rdev->ddev);
32843284
/* Fence driver */
3285-
r = radeon_fence_driver_init(rdev);
3286-
if (r)
3287-
return r;
3285+
radeon_fence_driver_init(rdev);
32883286
if (rdev->flags & RADEON_IS_AGP) {
32893287
r = radeon_agp_init(rdev);
32903288
if (r)

drivers/gpu/drm/radeon/radeon.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ struct radeon_fence {
385385
};
386386

387387
int radeon_fence_driver_start_ring(struct radeon_device *rdev, int ring);
388-
int radeon_fence_driver_init(struct radeon_device *rdev);
388+
void radeon_fence_driver_init(struct radeon_device *rdev);
389389
void radeon_fence_driver_fini(struct radeon_device *rdev);
390390
void radeon_fence_driver_force_completion(struct radeon_device *rdev, int ring);
391391
int radeon_fence_emit(struct radeon_device *rdev, struct radeon_fence **fence, int ring);

drivers/gpu/drm/radeon/radeon_fence.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -905,9 +905,8 @@ static void radeon_fence_driver_init_ring(struct radeon_device *rdev, int ring)
905905
* Not all asics have all rings, so each asic will only
906906
* start the fence driver on the rings it has using
907907
* radeon_fence_driver_start_ring().
908-
* Returns 0 for success.
909908
*/
910-
int radeon_fence_driver_init(struct radeon_device *rdev)
909+
void radeon_fence_driver_init(struct radeon_device *rdev)
911910
{
912911
int ring;
913912

@@ -917,8 +916,6 @@ int radeon_fence_driver_init(struct radeon_device *rdev)
917916
}
918917

919918
radeon_debugfs_fence_init(rdev);
920-
921-
return 0;
922919
}
923920

924921
/**

0 commit comments

Comments
 (0)