]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
soc: qcom: mdt_loader: simplify with cleanup.h
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Wed, 3 Jul 2024 09:42:37 +0000 (11:42 +0200)
committerBjorn Andersson <andersson@kernel.org>
Sat, 6 Jul 2024 17:56:50 +0000 (12:56 -0500)
Allocate the memory with scoped/cleanup.h to reduce error handling and
make the code a bit simpler.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20240703-thermal-const-v1-2-6e59e139c65d@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
drivers/soc/qcom/mdt_loader.c

index 6f177e46fa0f8ec3adff1338c0f0de3a41633cf6..b2c0fb55d4ae678ee333f0d6b8b586de319f53b1 100644 (file)
@@ -7,6 +7,7 @@
  * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
  */
 
+#include <linux/cleanup.h>
 #include <linux/device.h>
 #include <linux/elf.h>
 #include <linux/firmware.h>
@@ -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 firmware *seg_fw;
-       char *seg_name;
        ssize_t ret;
 
        if (strlen(fw_name) < 4)
                return -EINVAL;
 
-       seg_name = kstrdup(fw_name, GFP_KERNEL);
+       char *seg_name __free(kfree) = kstrdup(fw_name, GFP_KERNEL);
        if (!seg_name)
                return -ENOMEM;
 
@@ -52,7 +52,6 @@ static ssize_t mdt_load_split_segment(void *ptr, const struct elf32_phdr *phdrs,
                                        ptr, phdr->p_filesz);
        if (ret) {
                dev_err(dev, "error %zd loading %s\n", ret, seg_name);
-               kfree(seg_name);
                return ret;
        }
 
@@ -64,7 +63,6 @@ static ssize_t mdt_load_split_segment(void *ptr, const struct elf32_phdr *phdrs,
        }
 
        release_firmware(seg_fw);
-       kfree(seg_name);
 
        return ret;
 }