Re: [PATCH 02/14] cxl/pci: Consolidate wait_for_media() and wait_for_media_ready()

[Jonathan Cameron <Jonathan.Cameron@Huawei.com>]

On Thu, 12 May 2022 11:14:27 -0700
Dan Williams <dan.j.williams@intel.com> wrote:

> 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().
> 
> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

> ---
>  drivers/cxl/mem.c |   19 +------------------
>  drivers/cxl/pci.c |    4 ++--
>  2 files changed, 3 insertions(+), 20 deletions(-)
> 
> diff --git a/drivers/cxl/mem.c b/drivers/cxl/mem.c
> index c2d9dadf4a2e..7622cfefa1b0 100644
> --- a/drivers/cxl/mem.c
> +++ b/drivers/cxl/mem.c
> @@ -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;
> diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c
> index e7ab9a34d718..435f9f89b793 100644
> --- a/drivers/cxl/pci.c
> +++ b/drivers/cxl/pci.c
> @@ -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)
>