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

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

drm/i915: 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 4a2a450f

drivers/gpu/drm/i915/i915_debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -2202,7 +2202,7 @@ static void intel_encoder_info(struct seq_file *m, 
		struct drm_connector *connector = &intel_connector->base;

		seq_printf(m, "\t\tconnector %d: type: %s, status: %s",

			   connector->base.id,

			   drm_get_connector_name(connector),

			   connector->name,

			   drm_get_connector_status_name(connector->status));

		if (connector->status == connector_status_connected) {

			struct drm_display_mode *mode = &crtc->mode;
@@ -2273,7 +2273,7 @@ static void intel_connector_info(struct seq_file *m, 
	struct drm_display_mode *mode;



	seq_printf(m, "connector %d: type %s, status: %s\n",

		   connector->base.id, drm_get_connector_name(connector),

		   connector->base.id, connector->name,

		   drm_get_connector_status_name(connector->status));

	if (connector->status == connector_status_connected) {

		seq_printf(m, "\tname: %s\n", connector->display_info.name);

drivers/gpu/drm/i915/i915_irq.c

+4 −4
Original line number Diff line number Diff line
@@ -1089,7 +1089,7 @@ static bool intel_hpd_irq_event(struct drm_device *dev, 


	DRM_DEBUG_KMS("[CONNECTOR:%d:%s] status updated from %s to %s\n",

		      connector->base.id,

		      drm_get_connector_name(connector),

		      connector->name,

		      drm_get_connector_status_name(old_status),

		      drm_get_connector_status_name(connector->status));
@@ -1134,7 +1134,7 @@ static void i915_hotplug_work_func(struct work_struct *work) 
		    connector->polled == DRM_CONNECTOR_POLL_HPD) {

			DRM_INFO("HPD interrupt storm detected on connector %s: "

				 "switching from hotplug detection to polling\n",

				drm_get_connector_name(connector));

				connector->name);

			dev_priv->hpd_stats[intel_encoder->hpd_pin].hpd_mark = HPD_DISABLED;

			connector->polled = DRM_CONNECTOR_POLL_CONNECT

				| DRM_CONNECTOR_POLL_DISCONNECT;
@@ -1142,7 +1142,7 @@ static void i915_hotplug_work_func(struct work_struct *work) 
		}

		if (hpd_event_bits & (1 << intel_encoder->hpd_pin)) {

			DRM_DEBUG_KMS("Connector %s (pin %i) received hotplug event.\n",

				      drm_get_connector_name(connector), intel_encoder->hpd_pin);

				      connector->name, intel_encoder->hpd_pin);

		}

	}

	 /* if there were no outputs to poll, poll was disabled,
@@ -4321,7 +4321,7 @@ static void intel_hpd_irq_reenable(unsigned long data) 
			if (intel_connector->encoder->hpd_pin == i) {

				if (connector->polled != intel_connector->polled)

					DRM_DEBUG_DRIVER("Reenabling HPD on connector %s\n",

							 drm_get_connector_name(connector));

							 connector->name);

				connector->polled = intel_connector->polled;

				if (!connector->polled)

					connector->polled = DRM_CONNECTOR_POLL_HPD;

drivers/gpu/drm/i915/intel_crt.c

+1 −1
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ intel_crt_detect(struct drm_connector *connector, bool force) 
	intel_runtime_pm_get(dev_priv);



	DRM_DEBUG_KMS("[CONNECTOR:%d:%s] force=%d\n",

		      connector->base.id, drm_get_connector_name(connector),

		      connector->base.id, connector->name,

		      force);



	power_domain = intel_display_port_power_domain(intel_encoder);

drivers/gpu/drm/i915/intel_display.c

+8 −8
Original line number Diff line number Diff line
@@ -4929,7 +4929,7 @@ static void intel_connector_check_state(struct intel_connector *connector) 


		DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",

			      connector->base.base.id,

			      drm_get_connector_name(&connector->base));

			      connector->base.name);



		WARN(connector->base.dpms == DRM_MODE_DPMS_OFF,

		     "wrong connector dpms state\n");
@@ -7853,7 +7853,7 @@ void intel_write_eld(struct drm_encoder *encoder, 


	DRM_DEBUG_DRIVER("ELD on [CONNECTOR:%d:%s], [ENCODER:%d:%s]\n",

			 connector->base.id,

			 drm_get_connector_name(connector),

			 connector->name,

			 connector->encoder->base.id,

			 drm_get_encoder_name(connector->encoder));
@@ -8320,7 +8320,7 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector, 
	int i = -1;



	DRM_DEBUG_KMS("[CONNECTOR:%d:%s], [ENCODER:%d:%s]\n",

		      connector->base.id, drm_get_connector_name(connector),

		      connector->base.id, connector->name,

		      encoder->base.id, drm_get_encoder_name(encoder));



	/*
@@ -8432,7 +8432,7 @@ void intel_release_load_detect_pipe(struct drm_connector *connector, 
	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);



	DRM_DEBUG_KMS("[CONNECTOR:%d:%s], [ENCODER:%d:%s]\n",

		      connector->base.id, drm_get_connector_name(connector),

		      connector->base.id, connector->name,

		      encoder->base.id, drm_get_encoder_name(encoder));



	if (old->load_detect_temp) {
@@ -9404,7 +9404,7 @@ connected_sink_compute_bpp(struct intel_connector *connector, 


	DRM_DEBUG_KMS("[CONNECTOR:%d:%s] checking for sink bpp constrains\n",

		connector->base.base.id,

		drm_get_connector_name(&connector->base));

		connector->base.name);



	/* Don't use an invalid EDID bpc value */

	if (connector->base.display_info.bpc &&
@@ -10617,7 +10617,7 @@ intel_modeset_stage_output_state(struct drm_device *dev, 


			DRM_DEBUG_KMS("[CONNECTOR:%d:%s] to [NOCRTC]\n",

				connector->base.base.id,

				drm_get_connector_name(&connector->base));

				connector->base.name);

		}
@@ -10652,7 +10652,7 @@ intel_modeset_stage_output_state(struct drm_device *dev, 


		DRM_DEBUG_KMS("[CONNECTOR:%d:%s] to [CRTC:%d]\n",

			connector->base.base.id,

			drm_get_connector_name(&connector->base),

			connector->base.name,

			new_crtc->base.id);

	}
@@ -12103,7 +12103,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) 
		}

		DRM_DEBUG_KMS("[CONNECTOR:%d:%s] hw state readout: %s\n",

			      connector->base.base.id,

			      drm_get_connector_name(&connector->base),

			      connector->base.name,

			      connector->base.encoder ? "enabled" : "disabled");

	}

}

drivers/gpu/drm/i915/intel_dp.c

+1 −1
Original line number Diff line number Diff line
@@ -3453,7 +3453,7 @@ intel_dp_detect(struct drm_connector *connector, bool force) 
	intel_display_power_get(dev_priv, power_domain);



	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",

		      connector->base.id, drm_get_connector_name(connector));

		      connector->base.id, connector->name);



	intel_dp->has_audio = false;