5 files changed, 6 insertions, 6 deletions

diff --git a/drivers/gpu/drm/nouveau/dispnv04/dac.c b/drivers/gpu/drm/nouveau/dispnv04/dac.c
index 434b920f6bd4..a96dda48718e 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/dac.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/dac.c
@@ -414,7 +414,7 @@ static void nv04_dac_commit(struct drm_encoder *encoder)
         helper->dpms(encoder, DRM_MODE_DPMS_ON);
 
         NV_DEBUG(drm, "Output %s is running on CRTC %d using output %c\n",
-                 drm_get_connector_name(&nouveau_encoder_connector_get(nv_encoder)->base),
+                 nouveau_encoder_connector_get(nv_encoder)->base.name,
                  nv_crtc->index, '@' + ffs(nv_encoder->dcb->or));
 }
 
diff --git a/drivers/gpu/drm/nouveau/dispnv04/dfp.c b/drivers/gpu/drm/nouveau/dispnv04/dfp.c
index a2d669b4acf2..e57babb206d3 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/dfp.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/dfp.c
@@ -477,7 +477,7 @@ static void nv04_dfp_commit(struct drm_encoder *encoder)
         helper->dpms(encoder, DRM_MODE_DPMS_ON);
 
         NV_DEBUG(drm, "Output %s is running on CRTC %d using output %c\n",
-                 drm_get_connector_name(&nouveau_encoder_connector_get(nv_encoder)->base),
+                 nouveau_encoder_connector_get(nv_encoder)->base.name,
                  nv_crtc->index, '@' + ffs(nv_encoder->dcb->or));
 }
 
diff --git a/drivers/gpu/drm/nouveau/dispnv04/disp.c b/drivers/gpu/drm/nouveau/dispnv04/disp.c
index 2f1ed61f7c8c..4342fdaee707 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/disp.c
@@ -115,7 +115,7 @@ nv04_display_create(struct drm_device *dev)
                                  &dev->mode_config.connector_list, head) {
                 if (!connector->encoder_ids[0]) {
                         NV_WARN(drm, "%s has no encoders, removing\n",
-                                drm_get_connector_name(connector));
+                                connector->name);
                         connector->funcs->destroy(connector);
                 }
         }
diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
index 244822df8ffc..8667620b703a 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
@@ -171,7 +171,8 @@ static void nv04_tv_commit(struct drm_encoder *encoder)
         helper->dpms(encoder, DRM_MODE_DPMS_ON);
 
         NV_DEBUG(drm, "Output %s is running on CRTC %d using output %c\n",
-                 drm_get_connector_name(&nouveau_encoder_connector_get(nv_encoder)->base), nv_crtc->index, '@' + ffs(nv_encoder->dcb->or));
+                 nouveau_encoder_connector_get(nv_encoder)->base.name,
+                 nv_crtc->index, '@' + ffs(nv_encoder->dcb->or));
 }
 
 static void nv04_tv_destroy(struct drm_encoder *encoder)
diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
index acef48f4a4ea..195bd8e86c6a 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
@@ -612,8 +612,7 @@ static void nv17_tv_commit(struct drm_encoder *encoder)
         helper->dpms(encoder, DRM_MODE_DPMS_ON);
 
         NV_INFO(drm, "Output %s is running on CRTC %d using output %c\n",
-                drm_get_connector_name(
-                        &nouveau_encoder_connector_get(nv_encoder)->base),
+                nouveau_encoder_connector_get(nv_encoder)->base.name,
                 nv_crtc->index, '@' + ffs(nv_encoder->dcb->or));
 }