ACPI: NFIT: Use cleanup.h helpers instead of devm_*()

The new cleanup.h facilities that arrived in v6.5-rc1 can replace the
the usage of devm semantics in acpi_nfit_init_interleave_set(). That
routine appears to only be using devm to avoid goto statements. The
new __free() annotation at variable declaration time can achieve the same
effect more efficiently.

There is no end user visible side effects of this patch, I was
motivated to send this cleanup to practice using the new helpers.

Suggested-by: Dave Jiang <dave.jiang@intel.com>
Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Dave Jiang <dave.jiang@intel.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Michal Wilczynski <michal.wilczynski@intel.com>
Link: https://lore.kernel.org/r/20231017082905.1673316-1-michal.wilczynski@intel.com
Signed-off-by: Ira Weiny <ira.weiny@intel.com>

diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
index 9923855377570c194b4e80cf7878782597588edd..22bab4a5ca9f58fbf871d18679925b5e30253a2b 100644 (file)
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@ -2257,26 +2257,23 @@ static int acpi_nfit_init_interleave_set(struct acpi_nfit_desc *acpi_desc,
                struct nd_region_desc *ndr_desc,
                struct acpi_nfit_system_address *spa)
 {
+       u16 nr = ndr_desc->num_mappings;
+       struct nfit_set_info2 *info2 __free(kfree) =
+               kcalloc(nr, sizeof(*info2), GFP_KERNEL);
+       struct nfit_set_info *info __free(kfree) =
+               kcalloc(nr, sizeof(*info), GFP_KERNEL);
        struct device *dev = acpi_desc->dev;
        struct nd_interleave_set *nd_set;
-       u16 nr = ndr_desc->num_mappings;
-       struct nfit_set_info2 *info2;
-       struct nfit_set_info *info;
        int i;
 
+       if (!info || !info2)
+               return -ENOMEM;
+
        nd_set = devm_kzalloc(dev, sizeof(*nd_set), GFP_KERNEL);
        if (!nd_set)
                return -ENOMEM;
        import_guid(&nd_set->type_guid, spa->range_guid);
 
-       info = devm_kcalloc(dev, nr, sizeof(*info), GFP_KERNEL);
-       if (!info)
-               return -ENOMEM;
-
-       info2 = devm_kcalloc(dev, nr, sizeof(*info2), GFP_KERNEL);
-       if (!info2)
-               return -ENOMEM;
-
        for (i = 0; i < nr; i++) {
                struct nd_mapping_desc *mapping = &ndr_desc->mapping[i];
                struct nvdimm *nvdimm = mapping->nvdimm;
@@ -2337,8 +2334,6 @@ static int acpi_nfit_init_interleave_set(struct acpi_nfit_desc *acpi_desc,
        }
 
        ndr_desc->nd_set = nd_set;
-       devm_kfree(dev, info);
-       devm_kfree(dev, info2);
 
        return 0;
 }