diff options
author | Jani Nikula <jani.nikula@intel.com> | 2014-06-03 07:56:20 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2014-06-03 23:17:41 -0400 |
commit | 259338205c428454515a09654be69a9f6c983513 (patch) | |
tree | fbe2b707f62a95000202380c889bbf3aa7d39446 /drivers/gpu/drm/drm_edid.c | |
parent | 72082093aefa5294801de91acdc25f5ea6722000 (diff) |
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: 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/drm_edid.c')
-rw-r--r-- | drivers/gpu/drm/drm_edid.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 643f830f3413..085e5550aac5 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c | |||
@@ -1232,7 +1232,7 @@ drm_do_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter) | |||
1232 | if (i == 4 && print_bad_edid) { | 1232 | if (i == 4 && print_bad_edid) { |
1233 | dev_warn(connector->dev->dev, | 1233 | dev_warn(connector->dev->dev, |
1234 | "%s: Ignoring invalid EDID block %d.\n", | 1234 | "%s: Ignoring invalid EDID block %d.\n", |
1235 | drm_get_connector_name(connector), j); | 1235 | connector->name, j); |
1236 | 1236 | ||
1237 | connector->bad_edid_counter++; | 1237 | connector->bad_edid_counter++; |
1238 | } | 1238 | } |
@@ -1252,7 +1252,7 @@ drm_do_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter) | |||
1252 | carp: | 1252 | carp: |
1253 | if (print_bad_edid) { | 1253 | if (print_bad_edid) { |
1254 | dev_warn(connector->dev->dev, "%s: EDID block %d invalid.\n", | 1254 | dev_warn(connector->dev->dev, "%s: EDID block %d invalid.\n", |
1255 | drm_get_connector_name(connector), j); | 1255 | connector->name, j); |
1256 | } | 1256 | } |
1257 | connector->bad_edid_counter++; | 1257 | connector->bad_edid_counter++; |
1258 | 1258 | ||
@@ -3470,24 +3470,24 @@ static bool drm_assign_hdmi_deep_color_info(struct edid *edid, | |||
3470 | if (hdmi[6] & DRM_EDID_HDMI_DC_30) { | 3470 | if (hdmi[6] & DRM_EDID_HDMI_DC_30) { |
3471 | dc_bpc = 10; | 3471 | dc_bpc = 10; |
3472 | DRM_DEBUG("%s: HDMI sink does deep color 30.\n", | 3472 | DRM_DEBUG("%s: HDMI sink does deep color 30.\n", |
3473 | drm_get_connector_name(connector)); | 3473 | connector->name); |
3474 | } | 3474 | } |
3475 | 3475 | ||
3476 | if (hdmi[6] & DRM_EDID_HDMI_DC_36) { | 3476 | if (hdmi[6] & DRM_EDID_HDMI_DC_36) { |
3477 | dc_bpc = 12; | 3477 | dc_bpc = 12; |
3478 | DRM_DEBUG("%s: HDMI sink does deep color 36.\n", | 3478 | DRM_DEBUG("%s: HDMI sink does deep color 36.\n", |
3479 | drm_get_connector_name(connector)); | 3479 | connector->name); |
3480 | } | 3480 | } |
3481 | 3481 | ||
3482 | if (hdmi[6] & DRM_EDID_HDMI_DC_48) { | 3482 | if (hdmi[6] & DRM_EDID_HDMI_DC_48) { |
3483 | dc_bpc = 16; | 3483 | dc_bpc = 16; |
3484 | DRM_DEBUG("%s: HDMI sink does deep color 48.\n", | 3484 | DRM_DEBUG("%s: HDMI sink does deep color 48.\n", |
3485 | drm_get_connector_name(connector)); | 3485 | connector->name); |
3486 | } | 3486 | } |
3487 | 3487 | ||
3488 | if (dc_bpc > 0) { | 3488 | if (dc_bpc > 0) { |
3489 | DRM_DEBUG("%s: Assigning HDMI sink color depth as %d bpc.\n", | 3489 | DRM_DEBUG("%s: Assigning HDMI sink color depth as %d bpc.\n", |
3490 | drm_get_connector_name(connector), dc_bpc); | 3490 | connector->name, dc_bpc); |
3491 | info->bpc = dc_bpc; | 3491 | info->bpc = dc_bpc; |
3492 | 3492 | ||
3493 | /* | 3493 | /* |
@@ -3501,7 +3501,7 @@ static bool drm_assign_hdmi_deep_color_info(struct edid *edid, | |||
3501 | if (hdmi[6] & DRM_EDID_HDMI_DC_Y444) { | 3501 | if (hdmi[6] & DRM_EDID_HDMI_DC_Y444) { |
3502 | info->color_formats |= DRM_COLOR_FORMAT_YCRCB444; | 3502 | info->color_formats |= DRM_COLOR_FORMAT_YCRCB444; |
3503 | DRM_DEBUG("%s: HDMI sink does YCRCB444 in deep color.\n", | 3503 | DRM_DEBUG("%s: HDMI sink does YCRCB444 in deep color.\n", |
3504 | drm_get_connector_name(connector)); | 3504 | connector->name); |
3505 | } | 3505 | } |
3506 | 3506 | ||
3507 | /* | 3507 | /* |
@@ -3510,14 +3510,14 @@ static bool drm_assign_hdmi_deep_color_info(struct edid *edid, | |||
3510 | */ | 3510 | */ |
3511 | if (!(hdmi[6] & DRM_EDID_HDMI_DC_36)) { | 3511 | if (!(hdmi[6] & DRM_EDID_HDMI_DC_36)) { |
3512 | DRM_DEBUG("%s: HDMI sink should do DC_36, but does not!\n", | 3512 | DRM_DEBUG("%s: HDMI sink should do DC_36, but does not!\n", |
3513 | drm_get_connector_name(connector)); | 3513 | connector->name); |
3514 | } | 3514 | } |
3515 | 3515 | ||
3516 | return true; | 3516 | return true; |
3517 | } | 3517 | } |
3518 | else { | 3518 | else { |
3519 | DRM_DEBUG("%s: No deep color support on this HDMI sink.\n", | 3519 | DRM_DEBUG("%s: No deep color support on this HDMI sink.\n", |
3520 | drm_get_connector_name(connector)); | 3520 | connector->name); |
3521 | } | 3521 | } |
3522 | } | 3522 | } |
3523 | } | 3523 | } |
@@ -3600,7 +3600,7 @@ static void drm_add_display_info(struct edid *edid, | |||
3600 | } | 3600 | } |
3601 | 3601 | ||
3602 | DRM_DEBUG("%s: Assigning EDID-1.4 digital sink color depth as %d bpc.\n", | 3602 | DRM_DEBUG("%s: Assigning EDID-1.4 digital sink color depth as %d bpc.\n", |
3603 | drm_get_connector_name(connector), info->bpc); | 3603 | connector->name, info->bpc); |
3604 | 3604 | ||
3605 | info->color_formats |= DRM_COLOR_FORMAT_RGB444; | 3605 | info->color_formats |= DRM_COLOR_FORMAT_RGB444; |
3606 | if (edid->features & DRM_EDID_FEATURE_RGB_YCRCB444) | 3606 | if (edid->features & DRM_EDID_FEATURE_RGB_YCRCB444) |
@@ -3628,7 +3628,7 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid) | |||
3628 | } | 3628 | } |
3629 | if (!drm_edid_is_valid(edid)) { | 3629 | if (!drm_edid_is_valid(edid)) { |
3630 | dev_warn(connector->dev->dev, "%s: EDID invalid.\n", | 3630 | dev_warn(connector->dev->dev, "%s: EDID invalid.\n", |
3631 | drm_get_connector_name(connector)); | 3631 | connector->name); |
3632 | return 0; | 3632 | return 0; |
3633 | } | 3633 | } |
3634 | 3634 | ||