delete useless function return values & remove meaningless if(r) check code
Subsystems (2)
cover 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 series will 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.
Bernard Zhao (4):
drm/radeon: remove meaningless if(r) check code drm/radeon: remove meaningless if(r) check code drm/radeon: remove meaningless if(r) check code drm/radeon: delete useless return values
drivers/gpu/drm/radeon/cik.c | 4 +--- drivers/gpu/drm/radeon/evergreen.c | 4 +--- drivers/gpu/drm/radeon/ni.c | 4 +--- drivers/gpu/drm/radeon/r100.c | 4 +--- drivers/gpu/drm/radeon/r300.c | 4 +--- drivers/gpu/drm/radeon/r420.c | 5 +---- drivers/gpu/drm/radeon/r520.c | 4 +--- drivers/gpu/drm/radeon/r600.c | 4 +--- drivers/gpu/drm/radeon/radeon.h | 2 +- drivers/gpu/drm/radeon/radeon_fence.c | 5 +---- drivers/gpu/drm/radeon/rs400.c | 4 +--- drivers/gpu/drm/radeon/rs600.c | 4 +--- drivers/gpu/drm/radeon/rs690.c | 4 +--- drivers/gpu/drm/radeon/rv515.c | 4 +--- drivers/gpu/drm/radeon/rv770.c | 4 +--- drivers/gpu/drm/radeon/si.c | 4 +--- 16 files changed, 16 insertions(+), 48 deletions(-)
Signature · 1 line
2.31.0
PATCH 1/4 drm/radeon: remove meaningless if(r) check code
Function radeon_fence_driver_init always returns success, remove meaningless if(r) check code.
--- drivers/gpu/drm/radeon/cik.c | 4 +--- drivers/gpu/drm/radeon/evergreen.c | 4 +--- drivers/gpu/drm/radeon/ni.c | 4 +--- drivers/gpu/drm/radeon/si.c | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-)
drivers/gpu/drm/radeon/cik.c +1 -3
@@ -8584,9 +8584,7 @@ int cik_init(struct radeon_device *rdev)radeon_get_clock_info (rdev->ddev);/* Fence driver */ - r =radeon_fence_driver_init (rdev); -if (r) -return r; +radeon_fence_driver_init (rdev);/* initialize memory controller */ r =cik_mc_init (rdev);
drivers/gpu/drm/radeon/evergreen.c +1 -3
@@ -5208,9 +5208,7 @@ int evergreen_init(struct radeon_device *rdev)/* Initialize clocks */ radeon_get_clock_info (rdev->ddev);/* Fence driver */ - r =radeon_fence_driver_init (rdev); -if (r) -return r; +radeon_fence_driver_init (rdev);/* initialize AGP */ if (rdev->flags &RADEON_IS_AGP ) { r =radeon_agp_init (rdev);
drivers/gpu/drm/radeon/ni.c +1 -3
@@ -2375,9 +2375,7 @@ int cayman_init(struct radeon_device *rdev)/* Initialize clocks */ radeon_get_clock_info (rdev->ddev);/* Fence driver */ - r =radeon_fence_driver_init (rdev); -if (r) -return r; +radeon_fence_driver_init (rdev);/* initialize memory controller */ r =evergreen_mc_init (rdev);if (r)
drivers/gpu/drm/radeon/si.c +1 -3
@@ -6857,9 +6857,7 @@ int si_init(struct radeon_device *rdev)radeon_get_clock_info (rdev->ddev);/* Fence driver */ - r =radeon_fence_driver_init (rdev); -if (r) -return r; +radeon_fence_driver_init (rdev);/* initialize memory controller */ r =si_mc_init (rdev);
Signature · 1 line
2.31.0
PATCH 2/4 drm/radeon: remove meaningless if(r) check code
In reply to Bernard ZhaoFunction radeon_fence_driver_init always returns success, remove meaningless if(r) check code.
--- drivers/gpu/drm/radeon/r100.c | 4 +--- drivers/gpu/drm/radeon/r300.c | 4 +--- drivers/gpu/drm/radeon/r420.c | 5 +---- drivers/gpu/drm/radeon/r520.c | 4 +--- drivers/gpu/drm/radeon/r600.c | 4 +--- 5 files changed, 5 insertions(+), 16 deletions(-)
drivers/gpu/drm/radeon/r100.c +1 -3
@@ -4056,9 +4056,7 @@ int r100_init(struct radeon_device *rdev)/* initialize VRAM */ r100_mc_init (rdev);/* Fence driver */ - r =radeon_fence_driver_init (rdev); -if (r) -return r; +radeon_fence_driver_init (rdev);/* Memory manager */ r =radeon_bo_init (rdev);if (r)
drivers/gpu/drm/radeon/r300.c +1 -3
@@ -1549,9 +1549,7 @@ int r300_init(struct radeon_device *rdev)/* initialize memory controller */ r300_mc_init (rdev);/* Fence driver */ - r =radeon_fence_driver_init (rdev); -if (r) -return r; +radeon_fence_driver_init (rdev);/* Memory manager */ r =radeon_bo_init (rdev);if (r)
drivers/gpu/drm/radeon/r420.c +1 -4
@@ -425,10 +425,7 @@ int r420_init(struct radeon_device *rdev)r300_mc_init (rdev);r420_debugfs (rdev);/* Fence driver */ - r =radeon_fence_driver_init (rdev); -if (r) { -return r; - } +radeon_fence_driver_init (rdev);/* Memory manager */ r =radeon_bo_init (rdev);if (r) {
drivers/gpu/drm/radeon/r520.c +1 -3
@@ -299,9 +299,7 @@ int r520_init(struct radeon_device *rdev)r520_mc_init (rdev);rv515_debugfs (rdev);/* Fence driver */ - r =radeon_fence_driver_init (rdev); -if (r) -return r; +radeon_fence_driver_init (rdev);/* Memory manager */ r =radeon_bo_init (rdev);if (r)
drivers/gpu/drm/radeon/r600.c +1 -3
@@ -3282,9 +3282,7 @@ int r600_init(struct radeon_device *rdev)/* Initialize clocks */ radeon_get_clock_info (rdev->ddev);/* Fence driver */ - r =radeon_fence_driver_init (rdev); -if (r) -return r; +radeon_fence_driver_init (rdev);if (rdev->flags &RADEON_IS_AGP ) { r =radeon_agp_init (rdev);if (r)
Signature · 1 line
2.31.0
PATCH 3/4 drm/radeon: remove meaningless if(r) check code
In reply to Bernard ZhaoFunction radeon_fence_driver_init always returns success, remove meaningless if(r) check code.
--- drivers/gpu/drm/radeon/rs400.c | 4 +--- drivers/gpu/drm/radeon/rs600.c | 4 +--- drivers/gpu/drm/radeon/rs690.c | 4 +--- drivers/gpu/drm/radeon/rv515.c | 4 +--- drivers/gpu/drm/radeon/rv770.c | 4 +--- 5 files changed, 5 insertions(+), 15 deletions(-)
drivers/gpu/drm/radeon/rs400.c +1 -3
@@ -555,9 +555,7 @@ int rs400_init(struct radeon_device *rdev)/* initialize memory controller */ rs400_mc_init (rdev);/* Fence driver */ - r =radeon_fence_driver_init (rdev); -if (r) -return r; +radeon_fence_driver_init (rdev);/* Memory manager */ r =radeon_bo_init (rdev);if (r)
drivers/gpu/drm/radeon/rs600.c +1 -3
@@ -1132,9 +1132,7 @@ int rs600_init(struct radeon_device *rdev)rs600_mc_init (rdev);r100_debugfs_rbbm_init (rdev);/* Fence driver */ - r =radeon_fence_driver_init (rdev); -if (r) -return r; +radeon_fence_driver_init (rdev);/* Memory manager */ r =radeon_bo_init (rdev);if (r)
drivers/gpu/drm/radeon/rs690.c +1 -3
@@ -850,9 +850,7 @@ int rs690_init(struct radeon_device *rdev)rs690_mc_init (rdev);rv515_debugfs (rdev);/* Fence driver */ - r =radeon_fence_driver_init (rdev); -if (r) -return r; +radeon_fence_driver_init (rdev);/* Memory manager */ r =radeon_bo_init (rdev);if (r)
drivers/gpu/drm/radeon/rv515.c +1 -3
@@ -648,9 +648,7 @@ int rv515_init(struct radeon_device *rdev)rv515_mc_init (rdev);rv515_debugfs (rdev);/* Fence driver */ - r =radeon_fence_driver_init (rdev); -if (r) -return r; +radeon_fence_driver_init (rdev);/* Memory manager */ r =radeon_bo_init (rdev);if (r)
drivers/gpu/drm/radeon/rv770.c +1 -3
@@ -1941,9 +1941,7 @@ int rv770_init(struct radeon_device *rdev)/* Initialize clocks */ radeon_get_clock_info (rdev->ddev);/* Fence driver */ - r =radeon_fence_driver_init (rdev); -if (r) -return r; +radeon_fence_driver_init (rdev);/* initialize AGP */ if (rdev->flags &RADEON_IS_AGP ) { r =radeon_agp_init (rdev);
Signature · 1 line
2.31.0
PATCH 4/4 drm/radeon: delete useless return values
In reply to Bernard ZhaoFunction radeon_fence_driver_init always returns success, the function type maybe coule be changed to void.
--- drivers/gpu/drm/radeon/radeon.h | 2 +- drivers/gpu/drm/radeon/radeon_fence.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-)
drivers/gpu/drm/radeon/radeon.h +1 -1
@@ -384,7 +384,7 @@ struct radeon_fence { };int radeon_fence_driver_start_ring (struct radeon_device *rdev,int ring); -int radeon_fence_driver_init (struct radeon_device *rdev); +void radeon_fence_driver_init (struct radeon_device *rdev);void radeon_fence_driver_fini (struct radeon_device *rdev);void radeon_fence_driver_force_completion (struct radeon_device *rdev,int ring);int radeon_fence_emit (struct radeon_device *rdev,struct radeon_fence **fence,int ring);
drivers/gpu/drm/radeon/radeon_fence.c +1 -4
@@ -905,9 +905,8 @@ static void radeon_fence_driver_init_ring(struct radeon_device *rdev, int ring)* Not all asics have all rings, so each asic will only * start the fence driver on the rings it has using * radeon_fence_driver_start_ring(). -* Returns 0 for success. */ -int radeon_fence_driver_init (struct radeon_device *rdev) +void radeon_fence_driver_init (struct radeon_device *rdev) {int ring;
@@ -917,8 +916,6 @@ int radeon_fence_driver_init(struct radeon_device *rdev) }radeon_debugfs_fence_init (rdev); - -return 0 ; }/**
Signature · 1 line
2.31.0
Christian König
maintainerAm 19.06.21 um 08:43 schrieb Bernard Zhao:
Quoted 5 lines
Function
radeon_fence_driver_initalways returns success, the function type maybe coule be changed to void. This patch series will first delete the check of the return value of the function callradeon_fence_driver_init, then, optimise the function declaration and function to void type.
Please merge all of this into a single patch, I don't see any point separating this.
Christian.
Quoted 27 lines
Signed-off-by Bernard Zhao <[email protected]>Bernard Zhao (4):
drm/radeon: remove meaningless if(r) check code drm/radeon: remove meaningless if(r) check code drm/radeon: remove meaningless if(r) check code drm/radeon: delete useless return valuesdrivers/gpu/drm/radeon/cik.c | 4 +--- drivers/gpu/drm/radeon/evergreen.c | 4 +--- drivers/gpu/drm/radeon/ni.c | 4 +--- drivers/gpu/drm/radeon/r100.c | 4 +--- drivers/gpu/drm/radeon/r300.c | 4 +--- drivers/gpu/drm/radeon/r420.c | 5 +---- drivers/gpu/drm/radeon/r520.c | 4 +--- drivers/gpu/drm/radeon/r600.c | 4 +--- drivers/gpu/drm/radeon/radeon.h | 2 +- drivers/gpu/drm/radeon/radeon_fence.c | 5 +---- drivers/gpu/drm/radeon/rs400.c | 4 +--- drivers/gpu/drm/radeon/rs600.c | 4 +--- drivers/gpu/drm/radeon/rs690.c | 4 +--- drivers/gpu/drm/radeon/rv515.c | 4 +--- drivers/gpu/drm/radeon/rv770.c | 4 +--- drivers/gpu/drm/radeon/si.c | 4 +--- 16 files changed, 16 insertions(+), 48 deletions(-)
From: "Christian König" <[email protected]>
Date: 2021-06-21 00:59:27
To: Bernard Zhao <[email protected]>,Alex Deucher <[email protected]>,David Airlie <[email protected]>,Daniel Vetter <[email protected]>,[email protected],[email protected],[email protected]
Subject: Re: [PATCH 0/4] delete useless function return values & remove meaningless if(r) check code>Am 19.06.21 um 08:43 schrieb Bernard Zhao:
Quoted 10 lines
Quoted 5 lines
Function
radeon_fence_driver_initalways returns success, the function type maybe coule be changed to void. This patch series will first delete the check of the return value of the function callradeon_fence_driver_init, then, optimise the function declaration and function to void type.Please merge all of this into a single patch, I don't see any point separating this.
Christian.
Hi
Sure, i will resubmit one new ptach, thanks!
BR//Bernard
Quoted 28 lines
Quoted 27 lines
Signed-off-by Bernard Zhao <[email protected]>Bernard Zhao (4):
drm/radeon: remove meaningless if(r) check code drm/radeon: remove meaningless if(r) check code drm/radeon: remove meaningless if(r) check code drm/radeon: delete useless return valuesdrivers/gpu/drm/radeon/cik.c | 4 +--- drivers/gpu/drm/radeon/evergreen.c | 4 +--- drivers/gpu/drm/radeon/ni.c | 4 +--- drivers/gpu/drm/radeon/r100.c | 4 +--- drivers/gpu/drm/radeon/r300.c | 4 +--- drivers/gpu/drm/radeon/r420.c | 5 +---- drivers/gpu/drm/radeon/r520.c | 4 +--- drivers/gpu/drm/radeon/r600.c | 4 +--- drivers/gpu/drm/radeon/radeon.h | 2 +- drivers/gpu/drm/radeon/radeon_fence.c | 5 +---- drivers/gpu/drm/radeon/rs400.c | 4 +--- drivers/gpu/drm/radeon/rs600.c | 4 +--- drivers/gpu/drm/radeon/rs690.c | 4 +--- drivers/gpu/drm/radeon/rv515.c | 4 +--- drivers/gpu/drm/radeon/rv770.c | 4 +--- drivers/gpu/drm/radeon/si.c | 4 +--- 16 files changed, 16 insertions(+), 48 deletions(-)