From a942385866ff99840e17365d22e2f84b7f650e2e Mon Sep 17 00:00:00 2001 From: Harry Wentland Date: Sat, 27 Feb 2016 14:43:22 -0500 Subject: [PATCH 0860/1110] drm/amd/dal: Use native strncmp directly Signed-off-by: Harry Wentland Acked-by: Harry Wentland --- drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_services.c | 5 ----- drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c | 2 +- drivers/gpu/drm/amd/dal/dc/dm_services.h | 2 -- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_services.c b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_services.c index 7bab44a..30fc871 100644 --- a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_services.c +++ b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_services.c @@ -40,11 +40,6 @@ #define dm_realloc(ptr, size) krealloc(ptr, size, GFP_KERNEL) #define dm_free(ptr) kfree(ptr) -int32_t dm_strncmp(const char *p1, const char *p2, uint32_t count) -{ - return strncmp(p1, p2, count); -} - void dm_sleep_in_milliseconds(struct dc_context *ctx, uint32_t milliseconds) { if (milliseconds >= 20) diff --git a/drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c b/drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c index 22017ff..2922453 100644 --- a/drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c +++ b/drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c @@ -373,7 +373,7 @@ static uint32_t defer_delay_converter_wa( if (dal_ddc_service_get_dp_receiver_id_info(ddc, &dp_rec_info) && (dp_rec_info.branch_id == DP_BRANCH_DEVICE_ID_4) && - !dm_strncmp(dp_rec_info.branch_name, + !strncmp(dp_rec_info.branch_name, DP_DVI_CONVERTER_ID_4, sizeof(dp_rec_info.branch_name))) return defer_delay > I2C_OVER_AUX_DEFER_WA_DELAY ? diff --git a/drivers/gpu/drm/amd/dal/dc/dm_services.h b/drivers/gpu/drm/amd/dal/dc/dm_services.h index 3862682..2d44e92 100644 --- a/drivers/gpu/drm/amd/dal/dc/dm_services.h +++ b/drivers/gpu/drm/amd/dal/dc/dm_services.h @@ -44,8 +44,6 @@ #define dm_realloc(ptr, size) krealloc(ptr, size, GFP_KERNEL) #define dm_free(ptr) kfree(ptr) -int32_t dm_strncmp(const char *p1, const char *p2, uint32_t count); - irq_handler_idx dm_register_interrupt( struct dc_context *ctx, struct dc_interrupt_params *int_params, -- 2.7.4