Commit f2546eba authored by Dan Williams's avatar Dan Williams Committed by Dave Jiang
Browse files

cxl/mem: Drop @host argument to devm_cxl_add_memdev() 



In all cases the device that created the 'struct cxl_dev_state' instance is
also the device to host the devm cleanup of devm_cxl_add_memdev(). This
simplifies the function prototype, and limits a degree of freedom of the
API.

Cc: Smita Koralahalli <Smita.KoralahalliChannabasappa@amd.com>
Reviewed-by: default avatarJonathan Cameron <jonathan.cameron@huawei.com>
Reviewed-by: default avatarAlison Schofield <alison.schofield@intel.com>
Reviewed-by: default avatarDave Jiang <dave.jiang@intel.com>
Reviewed-by: default avatarBen Cheatham <benjamin.cheatham@amd.com>
Tested-by: default avatarAlejandro Lucero <alucerop@amd.com>
Link: https://patch.msgid.link/20251216005616.3090129-6-dan.j.williams@intel.com


Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
parent 6e1d2190

drivers/cxl/core/memdev.c

+1 −2
Original line number Diff line number Diff line
@@ -1093,8 +1093,7 @@ static struct cxl_memdev *cxl_memdev_autoremove(struct cxl_memdev *cxlmd) 
 * Core helper for devm_cxl_add_memdev() that wants to both create a device and

 * assert to the caller that upon return cxl_mem::probe() has been invoked.

 */

struct cxl_memdev *__devm_cxl_add_memdev(struct device *host,

					 struct cxl_dev_state *cxlds)

struct cxl_memdev *__devm_cxl_add_memdev(struct cxl_dev_state *cxlds)

{

	struct device *dev;

	int rc;

drivers/cxl/cxlmem.h

+2 −4
Original line number Diff line number Diff line
@@ -95,10 +95,8 @@ static inline bool is_cxl_endpoint(struct cxl_port *port) 
	return is_cxl_memdev(port->uport_dev);

}



struct cxl_memdev *__devm_cxl_add_memdev(struct device *host,

					 struct cxl_dev_state *cxlds);

struct cxl_memdev *devm_cxl_add_memdev(struct device *host,

				       struct cxl_dev_state *cxlds);

struct cxl_memdev *__devm_cxl_add_memdev(struct cxl_dev_state *cxlds);

struct cxl_memdev *devm_cxl_add_memdev(struct cxl_dev_state *cxlds);

int devm_cxl_sanitize_setup_notifier(struct device *host,

				     struct cxl_memdev *cxlmd);

struct cxl_memdev_state;

drivers/cxl/mem.c

+5 −4
Original line number Diff line number Diff line
@@ -165,17 +165,18 @@ static int cxl_mem_probe(struct device *dev) 


/**

 * devm_cxl_add_memdev - Add a CXL memory device

 * @host: devres alloc/release context and parent for the memdev

 * @cxlds: CXL device state to associate with the memdev

 *

 * Upon return the device will have had a chance to attach to the

 * cxl_mem driver, but may fail if the CXL topology is not ready

 * (hardware CXL link down, or software platform CXL root not attached)

 *

 * The parent of the resulting device and the devm context for allocations is

 * @cxlds->dev.

 */

struct cxl_memdev *devm_cxl_add_memdev(struct device *host,

				       struct cxl_dev_state *cxlds)

struct cxl_memdev *devm_cxl_add_memdev(struct cxl_dev_state *cxlds)

{

	return __devm_cxl_add_memdev(host, cxlds);

	return __devm_cxl_add_memdev(cxlds);

}

EXPORT_SYMBOL_NS_GPL(devm_cxl_add_memdev, "CXL");

drivers/cxl/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1006,7 +1006,7 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	if (rc)

		dev_dbg(&pdev->dev, "No CXL Features discovered\n");



	cxlmd = devm_cxl_add_memdev(&pdev->dev, cxlds);

	cxlmd = devm_cxl_add_memdev(cxlds);

	if (IS_ERR(cxlmd))

		return PTR_ERR(cxlmd);

tools/testing/cxl/test/mem.c

+1 −1
Original line number Diff line number Diff line
@@ -1767,7 +1767,7 @@ static int cxl_mock_mem_probe(struct platform_device *pdev) 


	cxl_mock_add_event_logs(&mdata->mes);



	cxlmd = devm_cxl_add_memdev(&pdev->dev, cxlds);

	cxlmd = devm_cxl_add_memdev(cxlds);

	if (IS_ERR(cxlmd))

		return PTR_ERR(cxlmd);