[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1473863952-7658-2-git-send-email-yamada.masahiro@socionext.com>
Date: Wed, 14 Sep 2016 23:39:08 +0900
From: Masahiro Yamada <yamada.masahiro@...ionext.com>
To: David Airlie <airlied@...ux.ie>, dri-devel@...ts.freedesktop.org
Cc: Christian K?nig <christian.koenig@....com>,
Jani Nikula <jani.nikula@...ux.intel.com>,
Alexander Deucher <Alexander.Deucher@....com>,
Masahiro Yamada <yamada.masahiro@...ionext.com>,
"Edward O'Callaghan" <funfunctor@...klore1984.net>,
Emily Deng <Emily.Deng@....com>,
Tom St Denis <tom.stdenis@....com>,
Eric Huang <JinHuiEric.Huang@....com>,
linux-kernel@...r.kernel.org, Huang Rui <ray.huang@....com>,
Chunming Zhou <David1.Zhou@....com>,
Michel Dänzer <michel.daenzer@....com>,
Alex Deucher <alexander.deucher@....com>,
Monk Liu <Monk.Liu@....com>, Flora Cui <Flora.Cui@....com>
Subject: [PATCH v2 1/5] drm/amdgpu: squash lines for simple wrapper functions
Remove unneeded variables and assignments.
Signed-off-by: Masahiro Yamada <yamada.masahiro@...ionext.com>
---
drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 6 +-----
drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 6 +-----
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 6 +-----
3 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
index 00663a7..619b604 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
@@ -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)
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
index 2b10e88..3d01291 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
@@ -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;
}
/**
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
index bee4978..ddb8081 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
@@ -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;
}
/**
--
1.9.1
Powered by blists - more mailing lists