diff options
author | Jani Nikula <jani.nikula@intel.com> | 2014-06-03 07:56:17 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2014-06-03 23:14:37 -0400 |
commit | c23cc4178dd1b8ffa8b47b0df14b2525293aa4b1 (patch) | |
tree | 6620cd2318f6529047a272cb414b7b23915bed71 /drivers/gpu/drm/i915/intel_fbdev.c | |
parent | 4a2a450fe26fc8c5e64e6b85d48ed02dc4815ff0 (diff) |
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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_fbdev.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_fbdev.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c index 2b36ce2a999e..e2d416149f53 100644 --- 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, | |||
344 | 344 | ||
345 | if (!enabled[i]) { | 345 | if (!enabled[i]) { |
346 | DRM_DEBUG_KMS("connector %s not enabled, skipping\n", | 346 | DRM_DEBUG_KMS("connector %s not enabled, skipping\n", |
347 | drm_get_connector_name(connector)); | 347 | connector->name); |
348 | continue; | 348 | continue; |
349 | } | 349 | } |
350 | 350 | ||
351 | encoder = connector->encoder; | 351 | encoder = connector->encoder; |
352 | if (!encoder || WARN_ON(!encoder->crtc)) { | 352 | if (!encoder || WARN_ON(!encoder->crtc)) { |
353 | DRM_DEBUG_KMS("connector %s has no encoder or crtc, skipping\n", | 353 | DRM_DEBUG_KMS("connector %s has no encoder or crtc, skipping\n", |
354 | drm_get_connector_name(connector)); | 354 | connector->name); |
355 | enabled[i] = false; | 355 | enabled[i] = false; |
356 | continue; | 356 | continue; |
357 | } | 357 | } |
@@ -374,7 +374,7 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper, | |||
374 | } | 374 | } |
375 | 375 | ||
376 | DRM_DEBUG_KMS("looking for cmdline mode on connector %s\n", | 376 | DRM_DEBUG_KMS("looking for cmdline mode on connector %s\n", |
377 | drm_get_connector_name(connector)); | 377 | connector->name); |
378 | 378 | ||
379 | /* go for command line mode first */ | 379 | /* go for command line mode first */ |
380 | modes[i] = drm_pick_cmdline_mode(fb_conn, width, height); | 380 | 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, | |||
382 | /* try for preferred next */ | 382 | /* try for preferred next */ |
383 | if (!modes[i]) { | 383 | if (!modes[i]) { |
384 | DRM_DEBUG_KMS("looking for preferred mode on connector %s\n", | 384 | DRM_DEBUG_KMS("looking for preferred mode on connector %s\n", |
385 | drm_get_connector_name(connector)); | 385 | connector->name); |
386 | modes[i] = drm_has_preferred_mode(fb_conn, width, | 386 | modes[i] = drm_has_preferred_mode(fb_conn, width, |
387 | height); | 387 | height); |
388 | } | 388 | } |
@@ -401,7 +401,7 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper, | |||
401 | * something we own. | 401 | * something we own. |
402 | */ | 402 | */ |
403 | DRM_DEBUG_KMS("looking for current mode on connector %s\n", | 403 | DRM_DEBUG_KMS("looking for current mode on connector %s\n", |
404 | drm_get_connector_name(connector)); | 404 | connector->name); |
405 | intel_mode_from_pipe_config(&encoder->crtc->hwmode, | 405 | intel_mode_from_pipe_config(&encoder->crtc->hwmode, |
406 | &to_intel_crtc(encoder->crtc)->config); | 406 | &to_intel_crtc(encoder->crtc)->config); |
407 | modes[i] = &encoder->crtc->hwmode; | 407 | modes[i] = &encoder->crtc->hwmode; |
@@ -409,7 +409,7 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper, | |||
409 | crtcs[i] = new_crtc; | 409 | crtcs[i] = new_crtc; |
410 | 410 | ||
411 | DRM_DEBUG_KMS("connector %s on pipe %d [CRTC:%d]: %dx%d%s\n", | 411 | DRM_DEBUG_KMS("connector %s on pipe %d [CRTC:%d]: %dx%d%s\n", |
412 | drm_get_connector_name(connector), | 412 | connector->name, |
413 | pipe_name(to_intel_crtc(encoder->crtc)->pipe), | 413 | pipe_name(to_intel_crtc(encoder->crtc)->pipe), |
414 | encoder->crtc->base.id, | 414 | encoder->crtc->base.id, |
415 | modes[i]->hdisplay, modes[i]->vdisplay, | 415 | modes[i]->hdisplay, modes[i]->vdisplay, |