Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c6c361a authored by Jani Nikula's avatar Jani Nikula Committed by Dave Airlie
Browse files

drm/nouveau: replace drm_get_connector_name() with direct name field use 



Generated using semantic patches:

@@
expression E;
@@

- drm_get_connector_name(&E)
+ E.name

@@
expression E;
@@

- drm_get_connector_name(E)
+ E->name

v2: Turn drm_get_connector_name(&E) into E.name instead of &(E)->name.

Acked-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent c23cc417

drivers/gpu/drm/nouveau/dispnv04/dac.c

+1 −1
Original line number Diff line number Diff line
@@ -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));

}

drivers/gpu/drm/nouveau/dispnv04/dfp.c

+1 −1
Original line number Diff line number Diff line
@@ -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));

}

drivers/gpu/drm/nouveau/dispnv04/disp.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

		}

	}

drivers/gpu/drm/nouveau/dispnv04/tvnv04.c

+2 −1
Original line number Diff line number Diff line
@@ -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)

drivers/gpu/drm/nouveau/dispnv04/tvnv17.c

+1 −2
Original line number Diff line number Diff line
@@ -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));

}