| Message ID | 1471802792-3059-1-git-send-email-xypron.glpk@gmx.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 08/21/2016 08:29 PM, Joe Perches wrote: > On Sun, 2016-08-21 at 20:06 +0200, Heinrich Schuchardt wrote: >> In an if block for (running == 0) running cannot be non-zero. > > This code could also be better unindented by one level > (all of the block would fit 80 columns) by changing: > > if (running == 0) { > [code...] > } > > return 0; > > to: > > if (running) > return 0; > > [code...] > > return 0; Should I revise my patch? Or should this be an additional patch?
Am 21.08.2016 um 20:06 schrieb Heinrich Schuchardt: > In an if block for (running == 0) running cannot be non-zero. > > Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> The following patches are all Reviewed-by: Christian König <christian.koenig@amd.com>: [PATCH 1/1] drm/amdgpu/gmc7: remove dead code [PATCH 1/1] drm/amdgpu/gmc8: remove dead code [PATCH 1/1] drm/amd/powerplay: avoid NULL pointer dereference [PATCH 1/1] drm/amd/powerplay: avoid NULL dereference, cz_hwmgr.c [PATCH 1/1] drm/radeon/cik: remove dead code [PATCH 1/1] drm/radeon: remove dead code, si_mc_load_microcode Thanks for the help, Christian. PS: Please send such minor cleanups as one set of patches next time, cause that makes reviewing them much easier. > --- > drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 8 -------- > 1 file changed, 8 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c > index 0b0f086..1239463 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c > @@ -203,11 +203,6 @@ static int gmc_v7_0_mc_load_microcode(struct amdgpu_device *adev) > running = REG_GET_FIELD(RREG32(mmMC_SEQ_SUP_CNTL), MC_SEQ_SUP_CNTL, RUN); > > if (running == 0) { > - if (running) { > - blackout = RREG32(mmMC_SHARED_BLACKOUT_CNTL); > - WREG32(mmMC_SHARED_BLACKOUT_CNTL, blackout | 1); > - } > - > /* reset the engine and set to writable */ > WREG32(mmMC_SEQ_SUP_CNTL, 0x00000008); > WREG32(mmMC_SEQ_SUP_CNTL, 0x00000010); > @@ -239,9 +234,6 @@ static int gmc_v7_0_mc_load_microcode(struct amdgpu_device *adev) > break; > udelay(1); > } > - > - if (running) > - WREG32(mmMC_SHARED_BLACKOUT_CNTL, blackout); > } > > return 0;
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c index 0b0f086..1239463 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c @@ -203,11 +203,6 @@ static int gmc_v7_0_mc_load_microcode(struct amdgpu_device *adev) running = REG_GET_FIELD(RREG32(mmMC_SEQ_SUP_CNTL), MC_SEQ_SUP_CNTL, RUN); if (running == 0) { - if (running) { - blackout = RREG32(mmMC_SHARED_BLACKOUT_CNTL); - WREG32(mmMC_SHARED_BLACKOUT_CNTL, blackout | 1); - } - /* reset the engine and set to writable */ WREG32(mmMC_SEQ_SUP_CNTL, 0x00000008); WREG32(mmMC_SEQ_SUP_CNTL, 0x00000010); @@ -239,9 +234,6 @@ static int gmc_v7_0_mc_load_microcode(struct amdgpu_device *adev) break; udelay(1); } - - if (running) - WREG32(mmMC_SHARED_BLACKOUT_CNTL, blackout); } return 0;
In an if block for (running == 0) running cannot be non-zero. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> --- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 8 -------- 1 file changed, 8 deletions(-)