1 files changed, 14 insertions, 14 deletions

diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
index c02fa27dd3f3..1413324982f0 100644
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@ -1282,7 +1282,7 @@ static ssize_t hw_error_scrub_store(struct device *dev,
         if (rc)
                 return rc;
 
-        device_lock(dev);
+        nfit_device_lock(dev);
         nd_desc = dev_get_drvdata(dev);
         if (nd_desc) {
                 struct acpi_nfit_desc *acpi_desc = to_acpi_desc(nd_desc);
@@ -1299,7 +1299,7 @@ static ssize_t hw_error_scrub_store(struct device *dev,
                         break;
                 }
         }
-        device_unlock(dev);
+        nfit_device_unlock(dev);
         if (rc)
                 return rc;
         return size;
@@ -1319,7 +1319,7 @@ static ssize_t scrub_show(struct device *dev,
         ssize_t rc = -ENXIO;
         bool busy;
 
-        device_lock(dev);
+        nfit_device_lock(dev);
         nd_desc = dev_get_drvdata(dev);
         if (!nd_desc) {
                 device_unlock(dev);
@@ -1339,7 +1339,7 @@ static ssize_t scrub_show(struct device *dev,
         }
 
         mutex_unlock(&acpi_desc->init_mutex);
-        device_unlock(dev);
+        nfit_device_unlock(dev);
         return rc;
 }
 
@@ -1356,14 +1356,14 @@ static ssize_t scrub_store(struct device *dev,
         if (val != 1)
                 return -EINVAL;
 
-        device_lock(dev);
+        nfit_device_lock(dev);
         nd_desc = dev_get_drvdata(dev);
         if (nd_desc) {
                 struct acpi_nfit_desc *acpi_desc = to_acpi_desc(nd_desc);
 
                 rc = acpi_nfit_ars_rescan(acpi_desc, ARS_REQ_LONG);
         }
-        device_unlock(dev);
+        nfit_device_unlock(dev);
         if (rc)
                 return rc;
         return size;
@@ -1749,9 +1749,9 @@ static void acpi_nvdimm_notify(acpi_handle handle, u32 event, void *data)
         struct acpi_device *adev = data;
         struct device *dev = &adev->dev;
 
-        device_lock(dev->parent);
+        nfit_device_lock(dev->parent);
         __acpi_nvdimm_notify(dev, event);
-        device_unlock(dev->parent);
+        nfit_device_unlock(dev->parent);
 }
 
 static bool acpi_nvdimm_has_method(struct acpi_device *adev, char *method)
@@ -3457,8 +3457,8 @@ static int acpi_nfit_flush_probe(struct nvdimm_bus_descriptor *nd_desc)
         struct device *dev = acpi_desc->dev;
 
         /* Bounce the device lock to flush acpi_nfit_add / acpi_nfit_notify */
-        device_lock(dev);
-        device_unlock(dev);
+        nfit_device_lock(dev);
+        nfit_device_unlock(dev);
 
         /* Bounce the init_mutex to complete initial registration */
         mutex_lock(&acpi_desc->init_mutex);
@@ -3602,8 +3602,8 @@ void acpi_nfit_shutdown(void *data)
          * acpi_nfit_ars_rescan() submissions have had a chance to
          * either submit or see ->cancel set.
          */
-        device_lock(bus_dev);
-        device_unlock(bus_dev);
+        nfit_device_lock(bus_dev);
+        nfit_device_unlock(bus_dev);
 
         flush_workqueue(nfit_wq);
 }
@@ -3746,9 +3746,9 @@ EXPORT_SYMBOL_GPL(__acpi_nfit_notify);
 
 static void acpi_nfit_notify(struct acpi_device *adev, u32 event)
 {
-        device_lock(&adev->dev);
+        nfit_device_lock(&adev->dev);
         __acpi_nfit_notify(&adev->dev, adev->handle, event);
-        device_unlock(&adev->dev);
+        nfit_device_unlock(&adev->dev);
 }
 
 static const struct acpi_device_id acpi_nfit_ids[] = {