cxl/core: use cleanup.h for devm_cxl_add_dax_region

Cleanup the gotos in the function.  No functional change.

Signed-off-by: Gregory Price <gourry@gourry.net>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Alison Schofield <alison.schofield@intel.com>
Link: https://patch.msgid.link/20260327020203.876122-4-gourry@gourry.net
Signed-off-by: Dave Jiang <dave.jiang@intel.com>

diff --git a/drivers/cxl/core/region_dax.c b/drivers/cxl/core/region_dax.c
index fe367759ac695039aabb8431f09e176dd0577900..de04f78f6ad867f9238ebb2101a314b6be62c650 100644 (file)
--- a/drivers/cxl/core/region_dax.c
+++ b/drivers/cxl/core/region_dax.c
@@ -81,29 +81,26 @@ static void cxlr_dax_unregister(void *_cxlr_dax)
 
 int devm_cxl_add_dax_region(struct cxl_region *cxlr)
 {
-       struct cxl_dax_region *cxlr_dax;
        struct device *dev;
        int rc;
 
-       cxlr_dax = cxl_dax_region_alloc(cxlr);
+       struct cxl_dax_region *cxlr_dax __free(put_cxl_dax_region) =
+               cxl_dax_region_alloc(cxlr);
        if (IS_ERR(cxlr_dax))
                return PTR_ERR(cxlr_dax);
 
        dev = &cxlr_dax->dev;
        rc = dev_set_name(dev, "dax_region%d", cxlr->id);
        if (rc)
-               goto err;
+               return rc;
 
        rc = device_add(dev);
        if (rc)
-               goto err;
+               return rc;
 
        dev_dbg(&cxlr->dev, "%s: register %s\n", dev_name(dev->parent),
                dev_name(dev));
 
        return devm_add_action_or_reset(&cxlr->dev, cxlr_dax_unregister,
-                                       cxlr_dax);
-err:
-       put_device(dev);
-       return rc;
+                                       no_free_ptr(cxlr_dax));
 }

diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h
index 9b947286eb9b013dc1f7753766f4e601faedb816..7f63a62c2a5fa6a27e926a9038ab3024eeb51593 100644 (file)
--- a/drivers/cxl/cxl.h
+++ b/drivers/cxl/cxl.h
@@ -808,6 +808,7 @@ DEFINE_FREE(put_cxl_root, struct cxl_root *, if (_T) put_device(&_T->port.dev))
 DEFINE_FREE(put_cxl_port, struct cxl_port *, if (!IS_ERR_OR_NULL(_T)) put_device(&_T->dev))
 DEFINE_FREE(put_cxl_root_decoder, struct cxl_root_decoder *, if (!IS_ERR_OR_NULL(_T)) put_device(&_T->cxlsd.cxld.dev))
 DEFINE_FREE(put_cxl_region, struct cxl_region *, if (!IS_ERR_OR_NULL(_T)) put_device(&_T->dev))
+DEFINE_FREE(put_cxl_dax_region, struct cxl_dax_region *, if (!IS_ERR_OR_NULL(_T)) put_device(&_T->dev))
 
 int devm_cxl_enumerate_ports(struct cxl_memdev *cxlmd);
 void cxl_bus_rescan(void);