Applied. Thanks!

Alex

On Mon, Sep 21, 2020 at 9:14 AM Qinglang Miao miaoqinglang@huawei.com wrote:

Simplify the return expression.

Signed-off-by: Qinglang Miao miaoqinglang@huawei.com

drivers/gpu/drm/amd/amdgpu/cik_ih.c | 7 +------ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 10 ++-------- 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/cik_ih.c b/drivers/gpu/drm/amd/amdgpu/cik_ih.c index 401c99f0b..db953e95f 100644 --- a/drivers/gpu/drm/amd/amdgpu/cik_ih.c +++ b/drivers/gpu/drm/amd/amdgpu/cik_ih.c @@ -316,14 +316,9 @@ static int cik_ih_sw_fini(void *handle)

static int cik_ih_hw_init(void *handle) {

•   int r;
    struct amdgpu_device *adev = (struct amdgpu_device *)handle;
  
  

•   r = cik_ih_irq_init(adev);
  

•   if (r)
  

•           return r;
  

•   return 0;
  

•   return cik_ih_irq_init(adev);
  

}

static int cik_ih_hw_fini(void *handle) diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c index 20d8a03ca..56ed108b2 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c @@ -2198,7 +2198,6 @@ static int gfx_v9_0_gpu_early_init(struct amdgpu_device *adev) static int gfx_v9_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 = &adev->gfx.compute_ring[ring_id];
    unsigned int hw_prio;
  

@@ -2223,13 +2222,8 @@ static int gfx_v9_0_compute_ring_init(struct amdgpu_device *adev, int ring_id, hw_prio = amdgpu_gfx_is_high_priority_compute_queue(adev, ring->queue) ? AMDGPU_GFX_PIPE_PRIO_HIGH : AMDGPU_GFX_PIPE_PRIO_NORMAL; /* type-2 packets are deprecated on MEC, use type-3 instead */

•   r = amdgpu_ring_init(adev, ring, 1024,
  

•                        &adev->gfx.eop_irq, irq_type, hw_prio);
  

•   if (r)
  

•           return r;
  

•   return 0;
  

•   return amdgpu_ring_init(adev, ring, 1024,
  

•                           &adev->gfx.eop_irq, irq_type, hw_prio);
  

}

static int gfx_v9_0_sw_init(void *handle)

2.23.0

---

amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx