drm/nouveau/kms/nv50: hide unused variables

After a recent change, two variables are only used in an #ifdef:

drivers/gpu/drm/nouveau/dispnv50/disp.c: In function 'nv50_sor_atomic_disable':
drivers/gpu/drm/nouveau/dispnv50/disp.c:1569:13: error: unused variable 'ret' [-Werror=unused-variable]
 1569 |         int ret;
      |             ^~~
drivers/gpu/drm/nouveau/dispnv50/disp.c:1568:28: error: unused variable 'aux' [-Werror=unused-variable]
 1568 |         struct drm_dp_aux *aux = &nv_connector->aux;
      |                            ^~~

Move them into the same conditional block, along with the nv_connector variable
that becomes unused during that fix.

Fixes: 757033808c95 ("drm/nouveau/kms/nv50-: fixup sink D3 before tearing down link")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Danilo Krummrich <dakr@redhat.com>
Signed-off-by: Danilo Krummrich <dakr@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230925155930.677620-1-arnd@kernel.org

diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index dcd19c4183894c441c2a42593b9cacded451d229..9066a1263b73a4ae9567e7f17d316393bba8454f 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -1560,15 +1560,13 @@ nv50_sor_atomic_disable(struct drm_encoder *encoder, struct drm_atomic_state *st
 {
        struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
        struct nv50_head *head = nv50_head(nv_encoder->crtc);
-       struct nouveau_connector *nv_connector = nv50_outp_get_old_connector(state, nv_encoder);
 #ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT
+       struct nouveau_connector *nv_connector = nv50_outp_get_old_connector(state, nv_encoder);
        struct nouveau_drm *drm = nouveau_drm(nv_encoder->base.base.dev);
        struct nouveau_backlight *backlight = nv_connector->backlight;
-#endif
        struct drm_dp_aux *aux = &nv_connector->aux;
        int ret;
 
-#ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT
        if (backlight && backlight->uses_dpcd) {
                ret = drm_edp_backlight_disable(aux, &backlight->edp_info);
                if (ret < 0)