Commit 1e14c9fb authored by Dan Williams's avatar Dan Williams
Browse files

cxl/pci: Consolidate wait_for_media() and wait_for_media_ready() 



Now that wait_for_media() does nothing supplemental to
wait_for_media_ready() just promote wait_for_media_ready() to a common
helper and drop wait_for_media().

Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/165291686046.1426646.4390664747934592185.stgit@dwillia2-xfh


Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 2bcf3bbd

drivers/cxl/mem.c

+1 −18
Original line number Diff line number Diff line
@@ -24,23 +24,6 @@ 
 * in higher level operations.

 */



static int wait_for_media(struct cxl_memdev *cxlmd)

{

	struct cxl_dev_state *cxlds = cxlmd->cxlds;

	int rc;



	rc = cxlds->wait_media_ready(cxlds);

	if (rc)

		return rc;



	/*

	 * We know the device is active, and enabled, if any ranges are non-zero

	 * we'll need to check later before adding the port since that owns the

	 * HDM decoder registers.

	 */

	return 0;

}



static int create_endpoint(struct cxl_memdev *cxlmd,

			   struct cxl_port *parent_port)

{
@@ -157,7 +140,7 @@ static int cxl_mem_probe(struct device *dev) 
	if (work_pending(&cxlmd->detach_work))

		return -EBUSY;



	rc = wait_for_media(cxlmd);

	rc = cxlds->wait_media_ready(cxlds);

	if (rc) {

		dev_err(dev, "Media not active (%d)\n", rc);

		return rc;

drivers/cxl/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ static int wait_for_valid(struct cxl_dev_state *cxlds) 
 * Wait up to @mbox_ready_timeout for the device to report memory

 * active.

 */

static int wait_for_media_ready(struct cxl_dev_state *cxlds)

static int cxl_await_media_ready(struct cxl_dev_state *cxlds)

{

	struct pci_dev *pdev = to_pci_dev(cxlds->dev);

	int d = cxlds->cxl_dvsec;
@@ -593,7 +593,7 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		dev_warn(&pdev->dev,

			 "Device DVSEC not present, skip CXL.mem init\n");



	cxlds->wait_media_ready = wait_for_media_ready;

	cxlds->wait_media_ready = cxl_await_media_ready;



	rc = cxl_setup_regs(pdev, CXL_REGLOC_RBI_MEMDEV, &map);

	if (rc)