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

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

drm: 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: 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 72082093

drivers/gpu/drm/drm_crtc.c

+2 −2
Original line number Diff line number Diff line
@@ -1663,7 +1663,7 @@ int drm_mode_getresources(struct drm_device *dev, void *data, 
					    head) {

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

					connector->base.id,

					drm_get_connector_name(connector));

					connector->name);

				if (put_user(connector->base.id,

					     connector_id + copied)) {

					ret = -EFAULT;
@@ -2458,7 +2458,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, 
			connector = obj_to_connector(obj);

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

					connector->base.id,

					drm_get_connector_name(connector));

					connector->name);



			connector_set[i] = connector;

		}

drivers/gpu/drm/drm_crtc_helper.c

+3 −3
Original line number Diff line number Diff line
@@ -600,11 +600,11 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set) 
		}

		if (new_crtc) {

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

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

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

				new_crtc->base.id);

		} else {

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

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

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

		}

	}
@@ -630,7 +630,7 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set) 
			DRM_DEBUG_KMS("Setting connector DPMS state to on\n");

			for (i = 0; i < set->num_connectors; i++) {

				DRM_DEBUG_KMS("\t[CONNECTOR:%d:%s] set DPMS on\n", set->connectors[i]->base.id,

					      drm_get_connector_name(set->connectors[i]));

					      set->connectors[i]->name);

				set->connectors[i]->funcs->dpms(set->connectors[i], DRM_MODE_DPMS_ON);

			}

		}

drivers/gpu/drm/drm_edid.c

+11 −11
Original line number Diff line number Diff line
@@ -1232,7 +1232,7 @@ drm_do_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter) 
		if (i == 4 && print_bad_edid) {

			dev_warn(connector->dev->dev,

			 "%s: Ignoring invalid EDID block %d.\n",

			 drm_get_connector_name(connector), j);

			 connector->name, j);



			connector->bad_edid_counter++;

		}
@@ -1252,7 +1252,7 @@ drm_do_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter) 
carp:

	if (print_bad_edid) {

		dev_warn(connector->dev->dev, "%s: EDID block %d invalid.\n",

			 drm_get_connector_name(connector), j);

			 connector->name, j);

	}

	connector->bad_edid_counter++;
@@ -3470,24 +3470,24 @@ static bool drm_assign_hdmi_deep_color_info(struct edid *edid, 
			if (hdmi[6] & DRM_EDID_HDMI_DC_30) {

				dc_bpc = 10;

				DRM_DEBUG("%s: HDMI sink does deep color 30.\n",

						  drm_get_connector_name(connector));

						  connector->name);

			}



			if (hdmi[6] & DRM_EDID_HDMI_DC_36) {

				dc_bpc = 12;

				DRM_DEBUG("%s: HDMI sink does deep color 36.\n",

						  drm_get_connector_name(connector));

						  connector->name);

			}



			if (hdmi[6] & DRM_EDID_HDMI_DC_48) {

				dc_bpc = 16;

				DRM_DEBUG("%s: HDMI sink does deep color 48.\n",

						  drm_get_connector_name(connector));

						  connector->name);

			}



			if (dc_bpc > 0) {

				DRM_DEBUG("%s: Assigning HDMI sink color depth as %d bpc.\n",

						  drm_get_connector_name(connector), dc_bpc);

						  connector->name, dc_bpc);

				info->bpc = dc_bpc;



				/*
@@ -3501,7 +3501,7 @@ static bool drm_assign_hdmi_deep_color_info(struct edid *edid, 
				if (hdmi[6] & DRM_EDID_HDMI_DC_Y444) {

					info->color_formats |= DRM_COLOR_FORMAT_YCRCB444;

					DRM_DEBUG("%s: HDMI sink does YCRCB444 in deep color.\n",

							  drm_get_connector_name(connector));

							  connector->name);

				}



				/*
@@ -3510,14 +3510,14 @@ static bool drm_assign_hdmi_deep_color_info(struct edid *edid, 
				 */

				if (!(hdmi[6] & DRM_EDID_HDMI_DC_36)) {

					DRM_DEBUG("%s: HDMI sink should do DC_36, but does not!\n",

							  drm_get_connector_name(connector));

							  connector->name);

				}



				return true;

			}

			else {

				DRM_DEBUG("%s: No deep color support on this HDMI sink.\n",

						  drm_get_connector_name(connector));

						  connector->name);

			}

		}

	}
@@ -3600,7 +3600,7 @@ static void drm_add_display_info(struct edid *edid, 
	}



	DRM_DEBUG("%s: Assigning EDID-1.4 digital sink color depth as %d bpc.\n",

			  drm_get_connector_name(connector), info->bpc);

			  connector->name, info->bpc);



	info->color_formats |= DRM_COLOR_FORMAT_RGB444;

	if (edid->features & DRM_EDID_FEATURE_RGB_YCRCB444)
@@ -3628,7 +3628,7 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid) 
	}

	if (!drm_edid_is_valid(edid)) {

		dev_warn(connector->dev->dev, "%s: EDID invalid.\n",

			 drm_get_connector_name(connector));

			 connector->name);

		return 0;

	}

drivers/gpu/drm/drm_edid_load.c

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static void *edid_load(struct drm_connector *connector, const char *name, 


int drm_load_edid_firmware(struct drm_connector *connector)

{

	const char *connector_name = drm_get_connector_name(connector);

	const char *connector_name = connector->name;

	char *edidname = edid_firmware, *last, *colon;

	int ret;

	struct edid *edid;

drivers/gpu/drm/drm_fb_helper.c

+3 −3
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static int drm_fb_helper_parse_command_line(struct drm_fb_helper *fb_helper) 
		mode = &fb_helper_conn->cmdline_mode;



		/* do something on return - turn off connector maybe */

		if (fb_get_options(drm_get_connector_name(connector), &option))

		if (fb_get_options(connector->name, &option))

			continue;



		if (drm_mode_parse_command_line_for_connector(option,
@@ -142,12 +142,12 @@ static int drm_fb_helper_parse_command_line(struct drm_fb_helper *fb_helper) 
				}



				DRM_INFO("forcing %s connector %s\n",

					 drm_get_connector_name(connector), s);

					 connector->name, s);

				connector->force = mode->force;

			}



			DRM_DEBUG_KMS("cmdline mode for connector %s %dx%d@%dHz%s%s%s\n",

				      drm_get_connector_name(connector),

				      connector->name,

				      mode->xres, mode->yres,

				      mode->refresh_specified ? mode->refresh : 60,

				      mode->rb ? " reduced blanking" : "",