Commit 29990ab5 authored by Gregory Price's avatar Gregory Price Committed by Dave Jiang
Browse files

cxl/core: use cleanup.h for devm_cxl_add_dax_region 



Cleanup the gotos in the function.  No functional change.

Signed-off-by: default avatarGregory Price <gourry@gourry.net>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Reviewed-by: default avatarAlison Schofield <alison.schofield@intel.com>
Link: https://patch.msgid.link/20260327020203.876122-4-gourry@gourry.net


Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
parent d747cf98

drivers/cxl/core/region_dax.c

+5 −8
Original line number Diff line number Diff line
@@ -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));

}

drivers/cxl/cxl.h

+1 −0
Original line number Diff line number Diff line
@@ -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);