@@ -167,8 +167,7 @@ static int edid_size(const u8 *edid, int data_size)
167
167
return (edid [0x7e ] + 1 ) * EDID_LENGTH ;
168
168
}
169
169
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 )
172
171
{
173
172
const struct firmware * fw = NULL ;
174
173
const u8 * fwdata ;
@@ -185,10 +184,10 @@ static void *edid_load(struct drm_connector *connector, const char *name,
185
184
struct platform_device * pdev ;
186
185
int err ;
187
186
188
- pdev = platform_device_register_simple (connector_name , -1 , NULL , 0 );
187
+ pdev = platform_device_register_simple (connector -> name , -1 , NULL , 0 );
189
188
if (IS_ERR (pdev )) {
190
189
DRM_ERROR ("Failed to register EDID firmware platform device "
191
- "for connector \"%s\"\n" , connector_name );
190
+ "for connector \"%s\"\n" , connector -> name );
192
191
return ERR_CAST (pdev );
193
192
}
194
193
@@ -244,7 +243,7 @@ static void *edid_load(struct drm_connector *connector, const char *name,
244
243
edid [EDID_LENGTH - 1 ] += edid [0x7e ] - valid_extensions ;
245
244
DRM_INFO ("Found %d valid extensions instead of %d in EDID data "
246
245
"\"%s\" for connector \"%s\"\n" , valid_extensions ,
247
- edid [0x7e ], name , connector_name );
246
+ edid [0x7e ], name , connector -> name );
248
247
edid [0x7e ] = valid_extensions ;
249
248
250
249
new_edid = krealloc (edid , (valid_extensions + 1 ) * EDID_LENGTH ,
@@ -256,7 +255,7 @@ static void *edid_load(struct drm_connector *connector, const char *name,
256
255
DRM_INFO ("Got %s EDID base block and %d extension%s from "
257
256
"\"%s\" for connector \"%s\"\n" , (builtin >= 0 ) ? "built-in" :
258
257
"external" , valid_extensions , valid_extensions == 1 ? "" : "s" ,
259
- name , connector_name );
258
+ name , connector -> name );
260
259
261
260
out :
262
261
release_firmware (fw );
@@ -265,7 +264,6 @@ static void *edid_load(struct drm_connector *connector, const char *name,
265
264
266
265
struct edid * drm_load_edid_firmware (struct drm_connector * connector )
267
266
{
268
- const char * connector_name = connector -> name ;
269
267
char * edidname , * last , * colon , * fwstr , * edidstr , * fallback = NULL ;
270
268
struct edid * edid ;
271
269
@@ -288,7 +286,7 @@ struct edid *drm_load_edid_firmware(struct drm_connector *connector)
288
286
while ((edidname = strsep (& edidstr , "," ))) {
289
287
colon = strchr (edidname , ':' );
290
288
if (colon != NULL ) {
291
- if (strncmp (connector_name , edidname , colon - edidname ))
289
+ if (strncmp (connector -> name , edidname , colon - edidname ))
292
290
continue ;
293
291
edidname = colon + 1 ;
294
292
break ;
@@ -310,7 +308,7 @@ struct edid *drm_load_edid_firmware(struct drm_connector *connector)
310
308
if (* last == '\n' )
311
309
* last = '\0' ;
312
310
313
- edid = edid_load (connector , edidname , connector_name );
311
+ edid = edid_load (connector , edidname );
314
312
kfree (fwstr );
315
313
316
314
return edid ;
0 commit comments