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: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 333dd12d62f43c193a2d589b27c6a749bdc93e6d..8f49a2964ed5b8912f2950945ae30edbf469318b 100644 (file)
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -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);

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 28bae6e4a42435b955bceb37a7fc84189b96ef92..cbf31cbfa0840f430e23f98870e1ff90ce66b341 100644 (file)
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -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;

diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 22d8347f7838eb67955b6fc3efd52b368975f867..1fc91df5829662a69f745f1d73601c66ca2bf4ad 100644 (file)
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -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);

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 90f4f05c3000c26be070e65f017def4c359e0cc5..e3232ce2b5fa2fafa7ae10d0fe66d0c330bb8b9f 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -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");
        }
 }

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 7f7df2c8eed3f88cd0fcab4ddc448cf39ca77a6a..8ef9034b68f3a98f74e1009270d751466afc149f 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -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;
 

diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
index 1604235d58e6f508446785677198ddbaf9a1be8b..a3631c0a5c283695ac75147dda830618f3ad55cc 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dvo.c
+++ b/drivers/gpu/drm/i915/intel_dvo.c
@@ -343,7 +343,7 @@ intel_dvo_detect(struct drm_connector *connector, bool force)
 {
        struct intel_dvo *intel_dvo = intel_attached_dvo(connector);
        DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
-                     connector->base.id, drm_get_connector_name(connector));
+                     connector->base.id, connector->name);
        return intel_dvo->dev.dev_ops->detect(&intel_dvo->dev);
 }
 

diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index 2b36ce2a999eb1bc636558404d92097c0b24c510..e2d416149f53726df7cbdf816a635a3c0679fdb3 100644 (file)
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -344,14 +344,14 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
 
                if (!enabled[i]) {
                        DRM_DEBUG_KMS("connector %s not enabled, skipping\n",
-                                     drm_get_connector_name(connector));
+                                     connector->name);
                        continue;
                }
 
                encoder = connector->encoder;
                if (!encoder || WARN_ON(!encoder->crtc)) {
                        DRM_DEBUG_KMS("connector %s has no encoder or crtc, skipping\n",
-                                     drm_get_connector_name(connector));
+                                     connector->name);
                        enabled[i] = false;
                        continue;
                }
@@ -374,7 +374,7 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
                }
 
                DRM_DEBUG_KMS("looking for cmdline mode on connector %s\n",
-                             drm_get_connector_name(connector));
+                             connector->name);
 
                /* go for command line mode first */
                modes[i] = drm_pick_cmdline_mode(fb_conn, width, height);
@@ -382,7 +382,7 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
                /* try for preferred next */
                if (!modes[i]) {
                        DRM_DEBUG_KMS("looking for preferred mode on connector %s\n",
-                                     drm_get_connector_name(connector));
+                                     connector->name);
                        modes[i] = drm_has_preferred_mode(fb_conn, width,
                                                          height);
                }
@@ -401,7 +401,7 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
                         * something we own.
                         */
                        DRM_DEBUG_KMS("looking for current mode on connector %s\n",
-                                     drm_get_connector_name(connector));
+                                     connector->name);
                        intel_mode_from_pipe_config(&encoder->crtc->hwmode,
                                                    &to_intel_crtc(encoder->crtc)->config);
                        modes[i] = &encoder->crtc->hwmode;
@@ -409,7 +409,7 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
                crtcs[i] = new_crtc;
 
                DRM_DEBUG_KMS("connector %s on pipe %d [CRTC:%d]: %dx%d%s\n",
-                             drm_get_connector_name(connector),
+                             connector->name,
                              pipe_name(to_intel_crtc(encoder->crtc)->pipe),
                              encoder->crtc->base.id,
                              modes[i]->hdisplay, modes[i]->vdisplay,

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 171d0dd0239ab44430bb5ffd5a2acd900296906b..eee2bbec2958d4d569dcc67c1c293b51fc9e5c34 100644 (file)
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -973,7 +973,7 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
        enum drm_connector_status status = connector_status_disconnected;
 
        DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
-                     connector->base.id, drm_get_connector_name(connector));
+                     connector->base.id, connector->name);
 
        power_domain = intel_display_port_power_domain(intel_encoder);
        intel_display_power_get(dev_priv, power_domain);

diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index d1539f3efe4469bb56b568f4d2e3c7a3451a3935..23126023aeba04e6819d9ad1fdd64f2b8d69b646 100644 (file)
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -334,7 +334,7 @@ intel_lvds_detect(struct drm_connector *connector, bool force)
        enum drm_connector_status status;
 
        DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
-                     connector->base.id, drm_get_connector_name(connector));
+                     connector->base.id, connector->name);
 
        status = intel_panel_detect(dev);
        if (status != connector_status_unknown)

diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index 776249bab488aafd36812dfd35ce62bd51d83872..3fb3f939dca571af624fc2b916a7367c7dbfbbbb 100644 (file)
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -1130,7 +1130,7 @@ int intel_panel_setup_backlight(struct drm_connector *connector)
 
        if (ret) {
                DRM_DEBUG_KMS("failed to setup backlight for connector %s\n",
-                             drm_get_connector_name(connector));
+                             connector->name);
                return ret;
        }
 

diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index aa2c609fccf10364b700cff54cf6d0c9201fb014..6a4d5bc17697867c00f34dd9476a294d3145d015 100644 (file)
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -1743,7 +1743,7 @@ intel_sdvo_detect(struct drm_connector *connector, bool force)
        enum drm_connector_status ret;
 
        DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
-                     connector->base.id, drm_get_connector_name(connector));
+                     connector->base.id, connector->name);
 
        if (!intel_sdvo_get_value(intel_sdvo,
                                  SDVO_CMD_GET_ATTACHED_DISPLAYS,
@@ -1805,7 +1805,7 @@ static void intel_sdvo_get_ddc_modes(struct drm_connector *connector)
        struct edid *edid;
 
        DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
-                     connector->base.id, drm_get_connector_name(connector));
+                     connector->base.id, connector->name);
 
        /* set the bus switch and get the modes */
        edid = intel_sdvo_get_edid(connector);
@@ -1903,7 +1903,7 @@ static void intel_sdvo_get_tv_modes(struct drm_connector *connector)
        int i;
 
        DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
-                     connector->base.id, drm_get_connector_name(connector));
+                     connector->base.id, connector->name);
 
        /* Read the list of supported input resolutions for the selected TV
         * format.
@@ -1940,7 +1940,7 @@ static void intel_sdvo_get_lvds_modes(struct drm_connector *connector)
        struct drm_display_mode *newmode;
 
        DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
-                     connector->base.id, drm_get_connector_name(connector));
+                     connector->base.id, connector->name);
 
        /*
         * Fetch modes from VBT. For SDVO prefer the VBT mode since some

diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index e0193e8020b853a07cea4fe393416218f1cd6de3..25850a86d70c043d614df05d7323fadb93fc675f 100644 (file)
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -1314,7 +1314,7 @@ intel_tv_detect(struct drm_connector *connector, bool force)
        int type;
 
        DRM_DEBUG_KMS("[CONNECTOR:%d:%s] force=%d\n",
-                     connector->base.id, drm_get_connector_name(connector),
+                     connector->base.id, connector->name,
                      force);
 
        mode = reported_modes[0];