Commit 3f92a7d8 authored by Minghao Chi's avatar Minghao Chi Committed by Alex Deucher
Browse files

drm/amdgpu: simplify the return expression 



Simplify the return expression.

Reported-by: default avatarZeal Robot <zealci@zte.com.cn>
Signed-off-by: default avatarMinghao Chi <chi.minghao@zte.com.cn>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0c1c5e4a

drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c

+2 −11
Original line number Diff line number Diff line
@@ -4726,7 +4726,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;
@@ -4746,17 +4745,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;
@@ -4781,12 +4776,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)