By handling the NULL inside release_region, we can remove some clutter in caller error handling for release_sdram_region.
Signed-off-by: Ahmad Fatoum <[email protected]> --- arch/arm/cpu/bootm-fip.c | 5 ++--- arch/arm/lib32/bootz.c | 3 +-- common/bootm.c | 18 ++++++------------ common/resource.c | 2 ++ fs/pstore/ram_core.c | 7 +++---- 5 files changed, 14 insertions(+), 21 deletions(-) diff --git a/arch/arm/cpu/bootm-fip.c b/arch/arm/cpu/bootm-fip.c index a50b3f4431d0..8d1ea3f109d1 100644 --- a/arch/arm/cpu/bootm-fip.c +++ b/arch/arm/cpu/bootm-fip.c @@ -52,9 +52,8 @@ static int desc_to_sdram(struct fip_image_desc *loadable, ulong load_address) static void desc_release_sdram(struct fip_image_desc *loadable) { - struct resource *res = loadable ? desc_get_res(loadable) : NULL; - if (res) - release_sdram_region(res); + if (loadable) + release_sdram_region(desc_get_res(loadable)); } enum { IMAGE_BL33, IMAGE_HW_CONFIG, IMAGE_COUNT }; diff --git a/arch/arm/lib32/bootz.c b/arch/arm/lib32/bootz.c index 6ed6af1d19e3..0ace36271026 100644 --- a/arch/arm/lib32/bootz.c +++ b/arch/arm/lib32/bootz.c @@ -127,8 +127,7 @@ static int do_bootz(int argc, char *argv[]) return 0; err_out2: - if (res) - release_sdram_region(res); + release_sdram_region(res); err_out1: free(zimage); err_out: diff --git a/common/bootm.c b/common/bootm.c index 26fd8227f01f..933e9dfc69fe 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -748,10 +748,8 @@ int bootm_boot(struct bootm_data *bootm_data) bootm_get_override(&data->oftree_file, bootm_overrides.oftree_file); if (bootm_get_override(&data->initrd_file, bootm_overrides.initrd_file)) { - if (data->initrd_res) { - release_sdram_region(data->initrd_res); - data->initrd_res = NULL; - } + release_sdram_region(data->initrd_res); + data->initrd_res = NULL; } ret = handler->bootm(data); @@ -759,14 +757,10 @@ int bootm_boot(struct bootm_data *bootm_data) pr_info("Dryrun. Aborted\n"); err_out: - if (data->os_res) - release_sdram_region(data->os_res); - if (data->initrd_res) - release_sdram_region(data->initrd_res); - if (data->oftree_res) - release_sdram_region(data->oftree_res); - if (data->tee_res) - release_sdram_region(data->tee_res); + release_sdram_region(data->os_res); + release_sdram_region(data->initrd_res); + release_sdram_region(data->oftree_res); + release_sdram_region(data->tee_res); if (image_is_uimage(data)) bootm_close_uimage(data); if (data->os_fit) diff --git a/common/resource.c b/common/resource.c index 078dc9f2ff2d..33eb122f4668 100644 --- a/common/resource.c +++ b/common/resource.c @@ -97,6 +97,8 @@ struct resource *__request_region(struct resource *parent, */ int release_region(struct resource *res) { + if (!res) + return 0; if (!list_empty(&res->children)) return -EBUSY; diff --git a/fs/pstore/ram_core.c b/fs/pstore/ram_core.c index 621987f1bade..6cf99fc4b284 100644 --- a/fs/pstore/ram_core.c +++ b/fs/pstore/ram_core.c @@ -397,10 +397,9 @@ void persistent_ram_free(struct persistent_ram_zone *prz) if (!prz) return; - if (prz->res) { - release_sdram_region(prz->res); - prz->res = NULL; - } + release_sdram_region(prz->res); + prz->res = NULL; + if (prz->rs_decoder) { free_rs(prz->rs_decoder); prz->rs_decoder = NULL; -- 2.47.3
