]> rtime.felk.cvut.cz Git - vajnamar/linux-xlnx.git/commitdiff
gpu: xilinx: dp-sub: Remove invalid return warning
authorTejas Upadhyay <tejas.upadhyay@xilinx.com>
Fri, 2 Jun 2017 09:35:29 +0000 (02:35 -0700)
committerMichal Simek <michal.simek@xilinx.com>
Wed, 21 Jun 2017 11:40:01 +0000 (13:40 +0200)
bool was returned from function which returns int
thus compiler was throwing warning. This patch
resolves same.

Signed-off-by: Tejas Upadhyay <tejasu@xilinx.com>
Reviewed-by: Hyun Kwon <hyun.kwon@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
drivers/gpu/drm/xilinx/xilinx_drm_dp_sub.c

index f09889105df372f2e7c3c79929d8d05fb254777f..7fa6e1c55ea1e6c7427bc796df85920551f2c803 100644 (file)
@@ -1712,7 +1712,7 @@ static int xilinx_drm_dp_sub_parse_of(struct xilinx_drm_dp_sub *dp_sub)
        struct xilinx_drm_dp_sub_layer *layer;
        const char *string;
        u32 fmt, i, size;
-       bool ret;
+       int ret;
 
        ret = of_property_read_string(node, "xlnx,output-fmt", &string);
        if (ret < 0) {
@@ -1756,8 +1756,7 @@ static int xilinx_drm_dp_sub_parse_of(struct xilinx_drm_dp_sub *dp_sub)
                                          full_range_offsets[i]);
        }
 
-       ret = of_property_read_bool(node, "xlnx,vid-primary");
-       if (ret)
+       if (of_property_read_bool(node, "xlnx,vid-primary"))
                dp_sub->layers[XILINX_DRM_DP_SUB_LAYER_VID].primary = true;
        else
                dp_sub->layers[XILINX_DRM_DP_SUB_LAYER_GFX].primary = true;