]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/amd/display: Explicit casting for grph object ids
authorHarry Wentland <harry.wentland@amd.com>
Thu, 12 Oct 2017 14:23:22 +0000 (10:23 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 4 Dec 2017 21:33:22 +0000 (16:33 -0500)
C++ compilers don't like the implicit conversion

Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Reviewed-by: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/include/grph_object_id.h

index 5eb2b4dc7b9c2bec9edbb5b9b338bd2192405744..03a7a9ca95eac6de24698679790fefba984a7c2a 100644 (file)
@@ -248,7 +248,7 @@ static inline enum controller_id dal_graphics_object_id_get_controller_id(
        struct graphics_object_id id)
 {
        if (id.type == OBJECT_TYPE_CONTROLLER)
-               return id.id;
+               return (enum controller_id) id.id;
        return CONTROLLER_ID_UNDEFINED;
 }
 
@@ -256,7 +256,7 @@ static inline enum clock_source_id dal_graphics_object_id_get_clock_source_id(
        struct graphics_object_id id)
 {
        if (id.type == OBJECT_TYPE_CLOCK_SOURCE)
-               return id.id;
+               return (enum clock_source_id) id.id;
        return CLOCK_SOURCE_ID_UNDEFINED;
 }
 
@@ -264,7 +264,7 @@ static inline enum encoder_id dal_graphics_object_id_get_encoder_id(
        struct graphics_object_id id)
 {
        if (id.type == OBJECT_TYPE_ENCODER)
-               return id.id;
+               return (enum encoder_id) id.id;
        return ENCODER_ID_UNKNOWN;
 }
 
@@ -272,7 +272,7 @@ static inline enum connector_id dal_graphics_object_id_get_connector_id(
        struct graphics_object_id id)
 {
        if (id.type == OBJECT_TYPE_CONNECTOR)
-               return id.id;
+               return (enum connector_id) id.id;
        return CONNECTOR_ID_UNKNOWN;
 }
 
@@ -280,7 +280,7 @@ static inline enum audio_id dal_graphics_object_id_get_audio_id(
        struct graphics_object_id id)
 {
        if (id.type == OBJECT_TYPE_AUDIO)
-               return id.id;
+               return (enum audio_id) id.id;
        return AUDIO_ID_UNKNOWN;
 }
 
@@ -288,7 +288,7 @@ static inline enum engine_id dal_graphics_object_id_get_engine_id(
        struct graphics_object_id id)
 {
        if (id.type == OBJECT_TYPE_ENGINE)
-               return id.id;
+               return (enum engine_id) id.id;
        return ENGINE_ID_UNKNOWN;
 }
 #endif