diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2453-amdgpu-dc-kfree-already-checks-for-NULL.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2453-amdgpu-dc-kfree-already-checks-for-NULL.patch | 107 |
1 files changed, 107 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2453-amdgpu-dc-kfree-already-checks-for-NULL.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2453-amdgpu-dc-kfree-already-checks-for-NULL.patch new file mode 100644 index 00000000..87a3bf8f --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2453-amdgpu-dc-kfree-already-checks-for-NULL.patch @@ -0,0 +1,107 @@ +From 6ea228e5034b618d4a75add1be51c0963be42c16 Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airlied@redhat.com> +Date: Tue, 3 Oct 2017 14:27:14 +1000 +Subject: [PATCH 2453/4131] amdgpu/dc: kfree already checks for NULL. + +Don't bother checking for it. + +Found with the cocci ifnullfree.cocci script. + +Signed-off-by: Dave Airlie <airlied@redhat.com> +--- + drivers/gpu/drm/amd/display/dc/basics/vector.c | 3 +-- + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 7 ++----- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 7 ++----- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 3 +-- + drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 11 +++-------- + 5 files changed, 9 insertions(+), 22 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/basics/vector.c b/drivers/gpu/drm/amd/display/dc/basics/vector.c +index e00fc4db..217b8f1 100644 +--- a/drivers/gpu/drm/amd/display/dc/basics/vector.c ++++ b/drivers/gpu/drm/amd/display/dc/basics/vector.c +@@ -130,8 +130,7 @@ struct vector *dal_vector_create( + void dal_vector_destruct( + struct vector *vector) + { +- if (vector->container != NULL) +- kfree(vector->container); ++ kfree(vector->container); + vector->count = 0; + vector->capacity = 0; + } +diff --git a/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c b/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c +index 2e003b5..6d2f886 100644 +--- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c ++++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c +@@ -119,11 +119,8 @@ struct dc_bios *bios_parser_create( + + static void destruct(struct bios_parser *bp) + { +- if (bp->base.bios_local_image) +- kfree(bp->base.bios_local_image); +- +- if (bp->base.integrated_info) +- kfree(bp->base.integrated_info); ++ kfree(bp->base.bios_local_image); ++ kfree(bp->base.integrated_info); + } + + static void bios_parser_destroy(struct dc_bios **dcb) +diff --git a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c +index 0c623b3..3d65e2a 100644 +--- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c ++++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c +@@ -85,11 +85,8 @@ static struct atom_encoder_caps_record *get_encoder_cap_record( + + static void destruct(struct bios_parser *bp) + { +- if (bp->base.bios_local_image) +- kfree(bp->base.bios_local_image); +- +- if (bp->base.integrated_info) +- kfree(bp->base.integrated_info); ++ kfree(bp->base.bios_local_image); ++ kfree(bp->base.integrated_info); + } + + static void firmware_parser_destroy(struct dc_bios **dcb) +diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +index 1832f25..99a4d19 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +@@ -159,8 +159,7 @@ void dc_destroy_resource_pool(struct dc *dc) + if (dc->res_pool) + dc->res_pool->funcs->destroy(&dc->res_pool); + +- if (dc->hwseq) +- kfree(dc->hwseq); ++ kfree(dc->hwseq); + } + } + +diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c +index 89036af..28e768d 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c +@@ -619,14 +619,9 @@ void dce110_clock_source_destroy(struct clock_source **clk_src) + + dce110_clk_src = TO_DCE110_CLK_SRC(*clk_src); + +- if (dce110_clk_src->dp_ss_params) +- kfree(dce110_clk_src->dp_ss_params); +- +- if (dce110_clk_src->hdmi_ss_params) +- kfree(dce110_clk_src->hdmi_ss_params); +- +- if (dce110_clk_src->dvi_ss_params) +- kfree(dce110_clk_src->dvi_ss_params); ++ kfree(dce110_clk_src->dp_ss_params); ++ kfree(dce110_clk_src->hdmi_ss_params); ++ kfree(dce110_clk_src->dvi_ss_params); + + kfree(dce110_clk_src); + *clk_src = NULL; +-- +2.7.4 + |