From: Dan Williams <dan.j.williams@intel.com>
Date: Wed, 18 May 2022 23:34:15 +0000 (-0700)
Subject: cxl/mem: Drop mem_enabled check from wait_for_media()
X-Git-Tag: v6.1-rc5~1225^2~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2bcf3bbd348fc10260aa6243ff6a22a1882b5b35;p=platform%2Fkernel%2Flinux-starfive.git

cxl/mem: Drop mem_enabled check from wait_for_media()

Media ready is asserted by the device independent of whether mem_enabled
was ever set. Drop this check to allow for dropping wait_for_media() in
favor of ->wait_media_ready().

Fixes: 8dd2bc0f8e02 ("cxl/mem: Add the cxl_mem driver")
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/165291685501.1426646.10372821863672431074.stgit@dwillia2-xfh
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---

diff --git a/drivers/cxl/mem.c b/drivers/cxl/mem.c
index 401b0fb..c2d9dad 100644
--- a/drivers/cxl/mem.c
+++ b/drivers/cxl/mem.c
@@ -27,12 +27,8 @@
 static int wait_for_media(struct cxl_memdev *cxlmd)
 {
 	struct cxl_dev_state *cxlds = cxlmd->cxlds;
-	struct cxl_endpoint_dvsec_info *info = &cxlds->info;
 	int rc;
 
-	if (!info->mem_enabled)
-		return -EBUSY;
-
 	rc = cxlds->wait_media_ready(cxlds);
 	if (rc)
 		return rc;