| Message ID | 20201109211855.3340030-2-lee.jones@linaro.org |
|---|---|
| State | Accepted |
| Commit | 92378a4b54c1a66b08da2cff3db1b9906c41f709 |
| Headers | show |
| Series | [01/20] drm/radeon/radeon_ttm: Place declaration of 'rdev' in same clause as its use | expand |
On Mon, Nov 9, 2020 at 4:19 PM Lee Jones <lee.jones@linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/radeon/radeon_ttm.c: In function ‘radeon_ttm_tt_create’: > drivers/gpu/drm/radeon/radeon_ttm.c:611:24: warning: variable ‘rdev’ set but not used [-Wunused-but-set-variable] > > Cc: Alex Deucher <alexander.deucher@amd.com> > Cc: "Christian König" <christian.koenig@amd.com> > Cc: David Airlie <airlied@linux.ie> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: Jerome Glisse <glisse@freedesktop.org> > Cc: amd-gfx@lists.freedesktop.org > Cc: dri-devel@lists.freedesktop.org > Signed-off-by: Lee Jones <lee.jones@linaro.org> Applied. Thanks! Alex > --- > drivers/gpu/drm/radeon/radeon_ttm.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c > index 95038ac3382e2..a8c915920070f 100644 > --- a/drivers/gpu/drm/radeon/radeon_ttm.c > +++ b/drivers/gpu/drm/radeon/radeon_ttm.c > @@ -608,21 +608,21 @@ static void radeon_ttm_backend_destroy(struct ttm_bo_device *bdev, struct ttm_tt > static struct ttm_tt *radeon_ttm_tt_create(struct ttm_buffer_object *bo, > uint32_t page_flags) > { > - struct radeon_device *rdev; > struct radeon_ttm_tt *gtt; > enum ttm_caching caching; > struct radeon_bo *rbo; > - > - rbo = container_of(bo, struct radeon_bo, tbo); > +#if IS_ENABLED(CONFIG_AGP) > + struct radeon_device *rdev; > > rdev = radeon_get_rdev(bo->bdev); > -#if IS_ENABLED(CONFIG_AGP) > if (rdev->flags & RADEON_IS_AGP) { > return ttm_agp_tt_create(bo, rdev->ddev->agp->bridge, > page_flags); > } > #endif > > + rbo = container_of(bo, struct radeon_bo, tbo); > + > gtt = kzalloc(sizeof(struct radeon_ttm_tt), GFP_KERNEL); > if (gtt == NULL) { > return NULL; > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index 95038ac3382e2..a8c915920070f 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c @@ -608,21 +608,21 @@ static void radeon_ttm_backend_destroy(struct ttm_bo_device *bdev, struct ttm_tt static struct ttm_tt *radeon_ttm_tt_create(struct ttm_buffer_object *bo, uint32_t page_flags) { - struct radeon_device *rdev; struct radeon_ttm_tt *gtt; enum ttm_caching caching; struct radeon_bo *rbo; - - rbo = container_of(bo, struct radeon_bo, tbo); +#if IS_ENABLED(CONFIG_AGP) + struct radeon_device *rdev; rdev = radeon_get_rdev(bo->bdev); -#if IS_ENABLED(CONFIG_AGP) if (rdev->flags & RADEON_IS_AGP) { return ttm_agp_tt_create(bo, rdev->ddev->agp->bridge, page_flags); } #endif + rbo = container_of(bo, struct radeon_bo, tbo); + gtt = kzalloc(sizeof(struct radeon_ttm_tt), GFP_KERNEL); if (gtt == NULL) { return NULL;
Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/radeon_ttm.c: In function ‘radeon_ttm_tt_create’: drivers/gpu/drm/radeon/radeon_ttm.c:611:24: warning: variable ‘rdev’ set but not used [-Wunused-but-set-variable] Cc: Alex Deucher <alexander.deucher@amd.com> Cc: "Christian König" <christian.koenig@amd.com> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: Jerome Glisse <glisse@freedesktop.org> Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones <lee.jones@linaro.org> --- drivers/gpu/drm/radeon/radeon_ttm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)