Commit 01dd825d authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Bjorn Andersson

soc: qcom: mdt_loader: simplify with cleanup.h

Allocate the memory with scoped/cleanup.h to reduce error handling and
make the code a bit simpler.
Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20240703-thermal-const-v1-2-6e59e139c65d@linaro.orgSigned-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent 04e60d7a
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved. * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
*/ */
#include <linux/cleanup.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/elf.h> #include <linux/elf.h>
#include <linux/firmware.h> #include <linux/firmware.h>
...@@ -37,13 +38,12 @@ static ssize_t mdt_load_split_segment(void *ptr, const struct elf32_phdr *phdrs, ...@@ -37,13 +38,12 @@ static ssize_t mdt_load_split_segment(void *ptr, const struct elf32_phdr *phdrs,
{ {
const struct elf32_phdr *phdr = &phdrs[segment]; const struct elf32_phdr *phdr = &phdrs[segment];
const struct firmware *seg_fw; const struct firmware *seg_fw;
char *seg_name;
ssize_t ret; ssize_t ret;
if (strlen(fw_name) < 4) if (strlen(fw_name) < 4)
return -EINVAL; return -EINVAL;
seg_name = kstrdup(fw_name, GFP_KERNEL); char *seg_name __free(kfree) = kstrdup(fw_name, GFP_KERNEL);
if (!seg_name) if (!seg_name)
return -ENOMEM; return -ENOMEM;
...@@ -52,7 +52,6 @@ static ssize_t mdt_load_split_segment(void *ptr, const struct elf32_phdr *phdrs, ...@@ -52,7 +52,6 @@ static ssize_t mdt_load_split_segment(void *ptr, const struct elf32_phdr *phdrs,
ptr, phdr->p_filesz); ptr, phdr->p_filesz);
if (ret) { if (ret) {
dev_err(dev, "error %zd loading %s\n", ret, seg_name); dev_err(dev, "error %zd loading %s\n", ret, seg_name);
kfree(seg_name);
return ret; return ret;
} }
...@@ -64,7 +63,6 @@ static ssize_t mdt_load_split_segment(void *ptr, const struct elf32_phdr *phdrs, ...@@ -64,7 +63,6 @@ static ssize_t mdt_load_split_segment(void *ptr, const struct elf32_phdr *phdrs,
} }
release_firmware(seg_fw); release_firmware(seg_fw);
kfree(seg_name);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment