Message ID | 20210515090155.186083-1-libaokun1@huawei.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [-next] drm/nouveau:disp: Remove set but not used variable 'ret' | expand |
ping 在 2021/5/15 17:01, Baokun Li 写道: > From: "libaokun1@huawei.com" <libaokun1@huawei.com> > > Fixes gcc '-Wunused-but-set-variable' warning: > > drivers/gpu/drm/nouveau/dispnv50/disp.c: In function 'nv50_mstm_cleanup': > drivers/gpu/drm/nouveau/dispnv50/disp.c:1389:6: warning: > variable ‘ret’ set but not used [-Wunused-but-set-variable] > > drivers/gpu/drm/nouveau/dispnv50/disp.c: In function 'nv50_mstm_prepare': > drivers/gpu/drm/nouveau/dispnv50/disp.c:1413:6: warning: > variable ‘ret’ set but not used [-Wunused-but-set-variable] > > It never used since introduction. > > Signed-off-by: Baokun Li <libaokun1@huawei.com> > --- > drivers/gpu/drm/nouveau/dispnv50/disp.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c > index 1c9c0cdf85db..5ee3f1fc76d7 100644 > --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c > +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c > @@ -1386,12 +1386,10 @@ nv50_mstm_cleanup(struct nv50_mstm *mstm) > { > struct nouveau_drm *drm = nouveau_drm(mstm->outp->base.base.dev); > struct drm_encoder *encoder; > - int ret; > > NV_ATOMIC(drm, "%s: mstm cleanup\n", mstm->outp->base.base.name); > - ret = drm_dp_check_act_status(&mstm->mgr); > - > - ret = drm_dp_update_payload_part2(&mstm->mgr); > + drm_dp_check_act_status(&mstm->mgr); > + drm_dp_update_payload_part2(&mstm->mgr); > > drm_for_each_encoder(encoder, mstm->outp->base.base.dev) { > if (encoder->encoder_type == DRM_MODE_ENCODER_DPMST) { > @@ -1410,10 +1408,9 @@ nv50_mstm_prepare(struct nv50_mstm *mstm) > { > struct nouveau_drm *drm = nouveau_drm(mstm->outp->base.base.dev); > struct drm_encoder *encoder; > - int ret; > > NV_ATOMIC(drm, "%s: mstm prepare\n", mstm->outp->base.base.name); > - ret = drm_dp_update_payload_part1(&mstm->mgr); > + drm_dp_update_payload_part1(&mstm->mgr); > > drm_for_each_encoder(encoder, mstm->outp->base.base.dev) { > if (encoder->encoder_type == DRM_MODE_ENCODER_DPMST) {
ping 在 2021/5/15 17:01, Baokun Li 写道: > From: "libaokun1@huawei.com" <libaokun1@huawei.com> > > Fixes gcc '-Wunused-but-set-variable' warning: > > drivers/gpu/drm/nouveau/dispnv50/disp.c: In function 'nv50_mstm_cleanup': > drivers/gpu/drm/nouveau/dispnv50/disp.c:1389:6: warning: > variable ‘ret’ set but not used [-Wunused-but-set-variable] > > drivers/gpu/drm/nouveau/dispnv50/disp.c: In function 'nv50_mstm_prepare': > drivers/gpu/drm/nouveau/dispnv50/disp.c:1413:6: warning: > variable ‘ret’ set but not used [-Wunused-but-set-variable] > > It never used since introduction. > > Signed-off-by: Baokun Li <libaokun1@huawei.com> > --- > drivers/gpu/drm/nouveau/dispnv50/disp.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c > index 1c9c0cdf85db..5ee3f1fc76d7 100644 > --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c > +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c > @@ -1386,12 +1386,10 @@ nv50_mstm_cleanup(struct nv50_mstm *mstm) > { > struct nouveau_drm *drm = nouveau_drm(mstm->outp->base.base.dev); > struct drm_encoder *encoder; > - int ret; > > NV_ATOMIC(drm, "%s: mstm cleanup\n", mstm->outp->base.base.name); > - ret = drm_dp_check_act_status(&mstm->mgr); > - > - ret = drm_dp_update_payload_part2(&mstm->mgr); > + drm_dp_check_act_status(&mstm->mgr); > + drm_dp_update_payload_part2(&mstm->mgr); > > drm_for_each_encoder(encoder, mstm->outp->base.base.dev) { > if (encoder->encoder_type == DRM_MODE_ENCODER_DPMST) { > @@ -1410,10 +1408,9 @@ nv50_mstm_prepare(struct nv50_mstm *mstm) > { > struct nouveau_drm *drm = nouveau_drm(mstm->outp->base.base.dev); > struct drm_encoder *encoder; > - int ret; > > NV_ATOMIC(drm, "%s: mstm prepare\n", mstm->outp->base.base.name); > - ret = drm_dp_update_payload_part1(&mstm->mgr); > + drm_dp_update_payload_part1(&mstm->mgr); > > drm_for_each_encoder(encoder, mstm->outp->base.base.dev) { > if (encoder->encoder_type == DRM_MODE_ENCODER_DPMST) {
diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index 1c9c0cdf85db..5ee3f1fc76d7 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -1386,12 +1386,10 @@ nv50_mstm_cleanup(struct nv50_mstm *mstm) { struct nouveau_drm *drm = nouveau_drm(mstm->outp->base.base.dev); struct drm_encoder *encoder; - int ret; NV_ATOMIC(drm, "%s: mstm cleanup\n", mstm->outp->base.base.name); - ret = drm_dp_check_act_status(&mstm->mgr); - - ret = drm_dp_update_payload_part2(&mstm->mgr); + drm_dp_check_act_status(&mstm->mgr); + drm_dp_update_payload_part2(&mstm->mgr); drm_for_each_encoder(encoder, mstm->outp->base.base.dev) { if (encoder->encoder_type == DRM_MODE_ENCODER_DPMST) { @@ -1410,10 +1408,9 @@ nv50_mstm_prepare(struct nv50_mstm *mstm) { struct nouveau_drm *drm = nouveau_drm(mstm->outp->base.base.dev); struct drm_encoder *encoder; - int ret; NV_ATOMIC(drm, "%s: mstm prepare\n", mstm->outp->base.base.name); - ret = drm_dp_update_payload_part1(&mstm->mgr); + drm_dp_update_payload_part1(&mstm->mgr); drm_for_each_encoder(encoder, mstm->outp->base.base.dev) { if (encoder->encoder_type == DRM_MODE_ENCODER_DPMST) {