1 files changed, 3 insertions, 12 deletions

diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
index 5970b8f5f768..14d9f5bea015 100644
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@ -3341,8 +3341,6 @@ static int acpi_nfit_clear_to_send(struct nvdimm_bus_descriptor *nd_desc,
                 struct nvdimm *nvdimm, unsigned int cmd)
 {
         struct acpi_nfit_desc *acpi_desc = to_acpi_nfit_desc(nd_desc);
-        struct nfit_spa *nfit_spa;
-        int rc = 0;
 
         if (nvdimm)
                 return 0;
@@ -3355,17 +3353,10 @@ static int acpi_nfit_clear_to_send(struct nvdimm_bus_descriptor *nd_desc,
          * just needs guarantees that any ARS it initiates are not
          * interrupted by any intervening start requests from userspace.
          */
-        mutex_lock(&acpi_desc->init_mutex);
-        list_for_each_entry(nfit_spa, &acpi_desc->spas, list)
-                if (acpi_desc->scrub_spa
-                                || test_bit(ARS_REQ_SHORT, &nfit_spa->ars_state)
-                                || test_bit(ARS_REQ_LONG, &nfit_spa->ars_state)) {
-                        rc = -EBUSY;
-                        break;
-                }
-        mutex_unlock(&acpi_desc->init_mutex);
+        if (work_busy(&acpi_desc->dwork.work))
+                return -EBUSY;
 
-        return rc;
+        return 0;
 }
 
 int acpi_nfit_ars_rescan(struct acpi_nfit_desc *acpi_desc,