2022-05-05 18:48:10

by CGEL

Subject: [PATCH] drm/amdgpu: simplify the return expression

From: Minghao Chi <[email protected]>

Simplify the return expression.

Reported-by: Zeal Robot <[email protected]>
Signed-off-by: Minghao Chi <[email protected]>
---
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
index 54446162db8b..3d8093bf1679 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
@@ -4688,7 +4688,6 @@ static void gfx_v10_0_gpu_early_init(struct amdgpu_device *adev)
static int gfx_v10_0_gfx_ring_init(struct amdgpu_device *adev, int ring_id,
int me, int pipe, int queue)
{
- int r;
struct amdgpu_ring *ring;
unsigned int irq_type;

@@ -4708,17 +4707,13 @@ static int gfx_v10_0_gfx_ring_init(struct amdgpu_device *adev, int ring_id,
sprintf(ring->name, "gfx_%d.%d.%d", ring->me, ring->pipe, ring->queue);

irq_type = AMDGPU_CP_IRQ_GFX_ME0_PIPE0_EOP + ring->pipe;
- r = amdgpu_ring_init(adev, ring, 1024, &adev->gfx.eop_irq, irq_type,
+ return amdgpu_ring_init(adev, ring, 1024, &adev->gfx.eop_irq, irq_type,
AMDGPU_RING_PRIO_DEFAULT, NULL);
- if (r)
- return r;
- return 0;
}

static int gfx_v10_0_compute_ring_init(struct amdgpu_device *adev, int ring_id,
int mec, int pipe, int queue)
{
- int r;
unsigned irq_type;
struct amdgpu_ring *ring;
unsigned int hw_prio;
@@ -4743,12 +4738,8 @@ static int gfx_v10_0_compute_ring_init(struct amdgpu_device *adev, int ring_id,
hw_prio = amdgpu_gfx_is_high_priority_compute_queue(adev, ring) ?
AMDGPU_RING_PRIO_2 : AMDGPU_RING_PRIO_DEFAULT;
/* type-2 packets are deprecated on MEC, use type-3 instead */
- r = amdgpu_ring_init(adev, ring, 1024, &adev->gfx.eop_irq, irq_type,
+ return amdgpu_ring_init(adev, ring, 1024, &adev->gfx.eop_irq, irq_type,
hw_prio, NULL);
- if (r)
- return r;
-
- return 0;
}

static int gfx_v10_0_sw_init(void *handle)
--
2.25.1

2022-05-09 03:28:38

by Alex Deucher

Subject: Re: [PATCH] drm/amdgpu: simplify the return expression

Applied. Thanks!

On Wed, May 4, 2022 at 10:11 PM <[email protected]> wrote:
>
> From: Minghao Chi <[email protected]>
>
> Simplify the return expression.
>
> Reported-by: Zeal Robot <[email protected]>
> Signed-off-by: Minghao Chi <[email protected]>
> ---
> drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 13 ++-----------
> 1 file changed, 2 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> index 54446162db8b..3d8093bf1679 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> @@ -4688,7 +4688,6 @@ static void gfx_v10_0_gpu_early_init(struct amdgpu_device *adev)
> static int gfx_v10_0_gfx_ring_init(struct amdgpu_device *adev, int ring_id,
> int me, int pipe, int queue)
> {
> - int r;
> struct amdgpu_ring *ring;
> unsigned int irq_type;
>
> @@ -4708,17 +4707,13 @@ static int gfx_v10_0_gfx_ring_init(struct amdgpu_device *adev, int ring_id,
> sprintf(ring->name, "gfx_%d.%d.%d", ring->me, ring->pipe, ring->queue);
>
> irq_type = AMDGPU_CP_IRQ_GFX_ME0_PIPE0_EOP + ring->pipe;
> - r = amdgpu_ring_init(adev, ring, 1024, &adev->gfx.eop_irq, irq_type,
> + return amdgpu_ring_init(adev, ring, 1024, &adev->gfx.eop_irq, irq_type,
> AMDGPU_RING_PRIO_DEFAULT, NULL);
> - if (r)
> - return r;
> - return 0;
> }
>
> static int gfx_v10_0_compute_ring_init(struct amdgpu_device *adev, int ring_id,
> int mec, int pipe, int queue)
> {
> - int r;
> unsigned irq_type;
> struct amdgpu_ring *ring;
> unsigned int hw_prio;
> @@ -4743,12 +4738,8 @@ static int gfx_v10_0_compute_ring_init(struct amdgpu_device *adev, int ring_id,
> hw_prio = amdgpu_gfx_is_high_priority_compute_queue(adev, ring) ?
> AMDGPU_RING_PRIO_2 : AMDGPU_RING_PRIO_DEFAULT;
> /* type-2 packets are deprecated on MEC, use type-3 instead */
> - r = amdgpu_ring_init(adev, ring, 1024, &adev->gfx.eop_irq, irq_type,
> + return amdgpu_ring_init(adev, ring, 1024, &adev->gfx.eop_irq, irq_type,
> hw_prio, NULL);
> - if (r)
> - return r;
> -
> - return 0;
> }
>
> static int gfx_v10_0_sw_init(void *handle)
> --
> 2.25.1
>
>