summaryrefslogtreecommitdiffstats
path: root/drivers/cxl/mem.c
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2022-05-19 01:34:15 +0200
committerDan Williams <dan.j.williams@intel.com>2022-05-19 17:50:40 +0200
commit2bcf3bbd348fc10260aa6243ff6a22a1882b5b35 (patch)
tree3a96cff9e9fb8d8074af2128edc8ece565c51707 /drivers/cxl/mem.c
parentnvdimm: Fix firmware activation deadlock scenarios (diff)
downloadlinux-2bcf3bbd348fc10260aa6243ff6a22a1882b5b35.tar.xz
linux-2bcf3bbd348fc10260aa6243ff6a22a1882b5b35.zip
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>
Diffstat (limited to 'drivers/cxl/mem.c')
-rw-r--r--drivers/cxl/mem.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/cxl/mem.c b/drivers/cxl/mem.c
index 401b0fbe21db..c2d9dadf4a2e 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;