[next] drm/amdgpu: remove redundant variable r and redundant return statement

Submitted by Colin King on Oct. 3, 2019, 9:40 p.m.

Details

Message ID 20191003214049.23067-1-colin.king@canonical.com
State New
Headers show
Series "drm/amdgpu: remove redundant variable r and redundant return statement" ( rev: 1 ) in DRI devel

Not browsing as part of any series.

Commit Message

Colin King Oct. 3, 2019, 9:40 p.m.
From: Colin Ian King <colin.king@canonical.com>

There is a return statement that is not reachable and a variable that
is not used.  Remove them.

Addresses-Coverity: ("Structurally dead code")
Fixes: de7b45babd9b ("drm/amdgpu: cleanup creating BOs at fixed location (v2)")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 --
 1 file changed, 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 481e4c381083..814159f15633 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -1636,7 +1636,6 @@  static void amdgpu_ttm_fw_reserve_vram_fini(struct amdgpu_device *adev)
 static int amdgpu_ttm_fw_reserve_vram_init(struct amdgpu_device *adev)
 {
 	uint64_t vram_size = adev->gmc.visible_vram_size;
-	int r;
 
 	adev->fw_vram_usage.va = NULL;
 	adev->fw_vram_usage.reserved_bo = NULL;
@@ -1651,7 +1650,6 @@  static int amdgpu_ttm_fw_reserve_vram_init(struct amdgpu_device *adev)
 					  AMDGPU_GEM_DOMAIN_VRAM,
 					  &adev->fw_vram_usage.reserved_bo,
 					  &adev->fw_vram_usage.va);
-	return r;
 }
 
 /**

Comments

Am 03.10.19 um 23:40 schrieb Colin King:
> From: Colin Ian King <colin.king@canonical.com>

>

> There is a return statement that is not reachable and a variable that

> is not used.  Remove them.

>

> Addresses-Coverity: ("Structurally dead code")

> Fixes: de7b45babd9b ("drm/amdgpu: cleanup creating BOs at fixed location (v2)")

> Signed-off-by: Colin Ian King <colin.king@canonical.com>


Reviewed-by: Christian König <christian.koenig@amd.com>


> ---

>   drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 --

>   1 file changed, 2 deletions(-)

>

> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

> index 481e4c381083..814159f15633 100644

> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

> @@ -1636,7 +1636,6 @@ static void amdgpu_ttm_fw_reserve_vram_fini(struct amdgpu_device *adev)

>   static int amdgpu_ttm_fw_reserve_vram_init(struct amdgpu_device *adev)

>   {

>   	uint64_t vram_size = adev->gmc.visible_vram_size;

> -	int r;

>   

>   	adev->fw_vram_usage.va = NULL;

>   	adev->fw_vram_usage.reserved_bo = NULL;

> @@ -1651,7 +1650,6 @@ static int amdgpu_ttm_fw_reserve_vram_init(struct amdgpu_device *adev)

>   					  AMDGPU_GEM_DOMAIN_VRAM,

>   					  &adev->fw_vram_usage.reserved_bo,

>   					  &adev->fw_vram_usage.va);

> -	return r;

>   }

>   

>   /**
On Fri, Oct 4, 2019 at 3:29 AM Koenig, Christian
<Christian.Koenig@amd.com> wrote:
>
> Am 03.10.19 um 23:40 schrieb Colin King:
> > From: Colin Ian King <colin.king@canonical.com>
> >
> > There is a return statement that is not reachable and a variable that
> > is not used.  Remove them.
> >
> > Addresses-Coverity: ("Structurally dead code")
> > Fixes: de7b45babd9b ("drm/amdgpu: cleanup creating BOs at fixed location (v2)")
> > Signed-off-by: Colin Ian King <colin.king@canonical.com>
>
> Reviewed-by: Christian König <christian.koenig@amd.com>

Applied.  Thanks!

Alex

>
> > ---
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 --
> >   1 file changed, 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> > index 481e4c381083..814159f15633 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> > @@ -1636,7 +1636,6 @@ static void amdgpu_ttm_fw_reserve_vram_fini(struct amdgpu_device *adev)
> >   static int amdgpu_ttm_fw_reserve_vram_init(struct amdgpu_device *adev)
> >   {
> >       uint64_t vram_size = adev->gmc.visible_vram_size;
> > -     int r;
> >
> >       adev->fw_vram_usage.va = NULL;
> >       adev->fw_vram_usage.reserved_bo = NULL;
> > @@ -1651,7 +1650,6 @@ static int amdgpu_ttm_fw_reserve_vram_init(struct amdgpu_device *adev)
> >                                         AMDGPU_GEM_DOMAIN_VRAM,
> >                                         &adev->fw_vram_usage.reserved_bo,
> >                                         &adev->fw_vram_usage.va);
> > -     return r;
> >   }
> >
> >   /**
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel