| Message ID | 1473863952-7658-2-git-send-email-yamada.masahiro@socionext.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Sep 14, 2016 at 10:39 AM, Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > Remove unneeded variables and assignments. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Applied to drm-misc Sean > --- > > 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 >
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; } /**
Remove unneeded variables and assignments. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.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(-)