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

Generated using semantic patch:

@@
expression E;
@@

- drm_get_connector_name(E)
+ E->name

[airlied: regenerated]

Acked-by: Alex Deucher <alexander.deucher@amd.com>
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/radeon/evergreen_hdmi.c b/drivers/gpu/drm/radeon/evergreen_hdmi.c
index b760ef52fdcda5b0d0006b1d01df5a9b1d83629d..1ec0e6e83f9f3492151d097c839251029996d6f6 100644 (file)
--- a/drivers/gpu/drm/radeon/evergreen_hdmi.c
+++ b/drivers/gpu/drm/radeon/evergreen_hdmi.c
@@ -342,19 +342,19 @@ void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode
                case 16:
                default:
                        DRM_DEBUG("%s: Disabling hdmi deep color for %d bpc.\n",
-                                        drm_get_connector_name(connector), bpc);
+                                        connector->name, bpc);
                        break;
                case 10:
                        val |= HDMI_DEEP_COLOR_ENABLE;
                        val |= HDMI_DEEP_COLOR_DEPTH(HDMI_30BIT_DEEP_COLOR);
                        DRM_DEBUG("%s: Enabling hdmi deep color 30 for 10 bpc.\n",
-                                        drm_get_connector_name(connector));
+                                        connector->name);
                        break;
                case 12:
                        val |= HDMI_DEEP_COLOR_ENABLE;
                        val |= HDMI_DEEP_COLOR_DEPTH(HDMI_36BIT_DEEP_COLOR);
                        DRM_DEBUG("%s: Enabling hdmi deep color 36 for 12 bpc.\n",
-                                        drm_get_connector_name(connector));
+                                        connector->name);
                        break;
        }
 

diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index 0dc61dde4c3e196f8860632d0ca3d7f2096f1eff..31d4cf60bae3c4668c8698e69a26b9e58cfeb641 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -150,7 +150,7 @@ int radeon_get_monitor_bpc(struct drm_connector *connector)
                /* hdmi deep color only implemented on DCE4+ */
                if ((bpc > 8) && !ASIC_IS_DCE4(rdev)) {
                        DRM_DEBUG("%s: HDMI deep color %d bpc unsupported. Using 8 bpc.\n",
-                                         drm_get_connector_name(connector), bpc);
+                                         connector->name, bpc);
                        bpc = 8;
                }
 
@@ -162,13 +162,13 @@ int radeon_get_monitor_bpc(struct drm_connector *connector)
                 */
                if (bpc > 12) {
                        DRM_DEBUG("%s: HDMI deep color %d bpc unsupported. Using 12 bpc.\n",
-                                         drm_get_connector_name(connector), bpc);
+                                         connector->name, bpc);
                        bpc = 12;
                }
        }
 
        DRM_DEBUG("%s: Display bpc=%d, returned bpc=%d\n",
-                         drm_get_connector_name(connector), connector->display_info.bpc, bpc);
+                         connector->name, connector->display_info.bpc, bpc);
 
        return bpc;
 }
@@ -285,13 +285,17 @@ radeon_connector_analog_encoder_conflict_solve(struct drm_connector *connector,
                                        continue;
 
                                if (priority == true) {
-                                       DRM_DEBUG_KMS("1: conflicting encoders switching off %s\n", drm_get_connector_name(conflict));
-                                       DRM_DEBUG_KMS("in favor of %s\n", drm_get_connector_name(connector));
+                                       DRM_DEBUG_KMS("1: conflicting encoders switching off %s\n",
+                                                     conflict->name);
+                                       DRM_DEBUG_KMS("in favor of %s\n",
+                                                     connector->name);
                                        conflict->status = connector_status_disconnected;
                                        radeon_connector_update_scratch_regs(conflict, connector_status_disconnected);
                                } else {
-                                       DRM_DEBUG_KMS("2: conflicting encoders switching off %s\n", drm_get_connector_name(connector));
-                                       DRM_DEBUG_KMS("in favor of %s\n", drm_get_connector_name(conflict));
+                                       DRM_DEBUG_KMS("2: conflicting encoders switching off %s\n",
+                                                     connector->name);
+                                       DRM_DEBUG_KMS("in favor of %s\n",
+                                                     conflict->name);
                                        current_status = connector_status_disconnected;
                                }
                                break;
@@ -812,7 +816,7 @@ radeon_vga_detect(struct drm_connector *connector, bool force)
 
                if (!radeon_connector->edid) {
                        DRM_ERROR("%s: probed a monitor but no|invalid EDID\n",
-                                       drm_get_connector_name(connector));
+                                       connector->name);
                        ret = connector_status_connected;
                } else {
                        radeon_connector->use_digital = !!(radeon_connector->edid->input & DRM_EDID_INPUT_DIGITAL);
@@ -1035,12 +1039,13 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)
 
                if (!radeon_connector->edid) {
                        DRM_ERROR("%s: probed a monitor but no|invalid EDID\n",
-                                       drm_get_connector_name(connector));
+                                       connector->name);
                        /* rs690 seems to have a problem with connectors not existing and always
                         * return a block of 0's. If we see this just stop polling on this output */
                        if ((rdev->family == CHIP_RS690 || rdev->family == CHIP_RS740) && radeon_connector->base.null_edid_counter) {
                                ret = connector_status_disconnected;
-                               DRM_ERROR("%s: detected RS690 floating bus bug, stopping ddc detect\n", drm_get_connector_name(connector));
+                               DRM_ERROR("%s: detected RS690 floating bus bug, stopping ddc detect\n",
+                                         connector->name);
                                radeon_connector->ddc_bus = NULL;
                        } else {
                                ret = connector_status_connected;

diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index d96d1ca74e7064bc75980452c134a7075b2d5f10..e330e762c36015f460b81bc8e117b01ca11d56fe 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -703,7 +703,7 @@ static void radeon_print_display_setup(struct drm_device *dev)
        list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
                radeon_connector = to_radeon_connector(connector);
                DRM_INFO("Connector %d:\n", i);
-               DRM_INFO("  %s\n", drm_get_connector_name(connector));
+               DRM_INFO("  %s\n", connector->name);
                if (radeon_connector->hpd.hpd != RADEON_HPD_NONE)
                        DRM_INFO("  %s\n", hpd_names[radeon_connector->hpd.hpd]);
                if (radeon_connector->ddc_bus) {