Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d912adef authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Sean Paul
Browse files

drm/amdgpu: squash lines for simple wrapper functions 



Remove unneeded variables and assignments.

Reviewed-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1473863952-7658-2-git-send-email-yamada.masahiro@socionext.com
parent ecebca79

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

+1 −5
Original line number Diff line number Diff line
@@ -466,11 +466,7 @@ static int dce_virtual_suspend(void *handle) 


static int dce_virtual_resume(void *handle)

{

	int ret;



	ret = dce_virtual_hw_init(handle);



	return ret;

	return dce_virtual_hw_init(handle);

}



static bool dce_virtual_is_idle(void *handle)

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

+1 −5
Original line number Diff line number Diff line
@@ -190,12 +190,8 @@ static int sdma_v2_4_init_microcode(struct amdgpu_device *adev) 
 */

static uint32_t sdma_v2_4_ring_get_rptr(struct amdgpu_ring *ring)

{

	u32 rptr;



	/* XXX check if swapping is necessary on BE */

	rptr = ring->adev->wb.wb[ring->rptr_offs] >> 2;



	return rptr;

	return ring->adev->wb.wb[ring->rptr_offs] >> 2;

}



/**

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

+1 −5
Original line number Diff line number Diff line
@@ -335,12 +335,8 @@ static int sdma_v3_0_init_microcode(struct amdgpu_device *adev) 
 */

static uint32_t sdma_v3_0_ring_get_rptr(struct amdgpu_ring *ring)

{

	u32 rptr;



	/* XXX check if swapping is necessary on BE */

	rptr = ring->adev->wb.wb[ring->rptr_offs] >> 2;



	return rptr;

	return ring->adev->wb.wb[ring->rptr_offs] >> 2;

}



/**