Skip to content

Commit 8319d26

Browse files
committed
drm/edid/firmware: drop redundant connector_name variable/parameter
Stop passing around something that's readily available in connector->name. Signed-off-by: Jani Nikula <[email protected]> Reviewed-by: Ville Syrjälä <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/befa53a33f2ea83094027a0e88d155779ad096e1.1666614699.git.jani.nikula@intel.com
1 parent 90b575f commit 8319d26

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

drivers/gpu/drm/drm_edid_load.c

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,7 @@ static int edid_size(const u8 *edid, int data_size)
167167
return (edid[0x7e] + 1) * EDID_LENGTH;
168168
}
169169

170-
static void *edid_load(struct drm_connector *connector, const char *name,
171-
const char *connector_name)
170+
static void *edid_load(struct drm_connector *connector, const char *name)
172171
{
173172
const struct firmware *fw = NULL;
174173
const u8 *fwdata;
@@ -185,10 +184,10 @@ static void *edid_load(struct drm_connector *connector, const char *name,
185184
struct platform_device *pdev;
186185
int err;
187186

188-
pdev = platform_device_register_simple(connector_name, -1, NULL, 0);
187+
pdev = platform_device_register_simple(connector->name, -1, NULL, 0);
189188
if (IS_ERR(pdev)) {
190189
DRM_ERROR("Failed to register EDID firmware platform device "
191-
"for connector \"%s\"\n", connector_name);
190+
"for connector \"%s\"\n", connector->name);
192191
return ERR_CAST(pdev);
193192
}
194193

@@ -244,7 +243,7 @@ static void *edid_load(struct drm_connector *connector, const char *name,
244243
edid[EDID_LENGTH-1] += edid[0x7e] - valid_extensions;
245244
DRM_INFO("Found %d valid extensions instead of %d in EDID data "
246245
"\"%s\" for connector \"%s\"\n", valid_extensions,
247-
edid[0x7e], name, connector_name);
246+
edid[0x7e], name, connector->name);
248247
edid[0x7e] = valid_extensions;
249248

250249
new_edid = krealloc(edid, (valid_extensions + 1) * EDID_LENGTH,
@@ -256,7 +255,7 @@ static void *edid_load(struct drm_connector *connector, const char *name,
256255
DRM_INFO("Got %s EDID base block and %d extension%s from "
257256
"\"%s\" for connector \"%s\"\n", (builtin >= 0) ? "built-in" :
258257
"external", valid_extensions, valid_extensions == 1 ? "" : "s",
259-
name, connector_name);
258+
name, connector->name);
260259

261260
out:
262261
release_firmware(fw);
@@ -265,7 +264,6 @@ static void *edid_load(struct drm_connector *connector, const char *name,
265264

266265
struct edid *drm_load_edid_firmware(struct drm_connector *connector)
267266
{
268-
const char *connector_name = connector->name;
269267
char *edidname, *last, *colon, *fwstr, *edidstr, *fallback = NULL;
270268
struct edid *edid;
271269

@@ -288,7 +286,7 @@ struct edid *drm_load_edid_firmware(struct drm_connector *connector)
288286
while ((edidname = strsep(&edidstr, ","))) {
289287
colon = strchr(edidname, ':');
290288
if (colon != NULL) {
291-
if (strncmp(connector_name, edidname, colon - edidname))
289+
if (strncmp(connector->name, edidname, colon - edidname))
292290
continue;
293291
edidname = colon + 1;
294292
break;
@@ -310,7 +308,7 @@ struct edid *drm_load_edid_firmware(struct drm_connector *connector)
310308
if (*last == '\n')
311309
*last = '\0';
312310

313-
edid = edid_load(connector, edidname, connector_name);
311+
edid = edid_load(connector, edidname);
314312
kfree(fwstr);
315313

316314
return edid;

0 commit comments

Comments
 (0)