1 files changed, 12 insertions, 12 deletions

diff --git a/drivers/nvdimm/pfn_devs.c b/drivers/nvdimm/pfn_devs.c
index df2bdbd22450..3e7b11cf1aae 100644
--- a/drivers/nvdimm/pfn_devs.c
+++ b/drivers/nvdimm/pfn_devs.c
@@ -67,7 +67,7 @@ static ssize_t mode_store(struct device *dev,
         struct nd_pfn *nd_pfn = to_nd_pfn_safe(dev);
         ssize_t rc = 0;
 
-        device_lock(dev);
+        nd_device_lock(dev);
         nvdimm_bus_lock(dev);
         if (dev->driver)
                 rc = -EBUSY;
@@ -89,7 +89,7 @@ static ssize_t mode_store(struct device *dev,
         dev_dbg(dev, "result: %zd wrote: %s%s", rc, buf,
                         buf[len - 1] == '\n' ? "" : "\n");
         nvdimm_bus_unlock(dev);
-        device_unlock(dev);
+        nd_device_unlock(dev);
 
         return rc ? rc : len;
 }
@@ -132,14 +132,14 @@ static ssize_t align_store(struct device *dev,
         struct nd_pfn *nd_pfn = to_nd_pfn_safe(dev);
         ssize_t rc;
 
-        device_lock(dev);
+        nd_device_lock(dev);
         nvdimm_bus_lock(dev);
         rc = nd_size_select_store(dev, buf, &nd_pfn->align,
                         nd_pfn_supported_alignments());
         dev_dbg(dev, "result: %zd wrote: %s%s", rc, buf,
                         buf[len - 1] == '\n' ? "" : "\n");
         nvdimm_bus_unlock(dev);
-        device_unlock(dev);
+        nd_device_unlock(dev);
 
         return rc ? rc : len;
 }
@@ -161,11 +161,11 @@ static ssize_t uuid_store(struct device *dev,
         struct nd_pfn *nd_pfn = to_nd_pfn_safe(dev);
         ssize_t rc;
 
-        device_lock(dev);
+        nd_device_lock(dev);
         rc = nd_uuid_store(dev, &nd_pfn->uuid, buf, len);
         dev_dbg(dev, "result: %zd wrote: %s%s", rc, buf,
                         buf[len - 1] == '\n' ? "" : "\n");
-        device_unlock(dev);
+        nd_device_unlock(dev);
 
         return rc ? rc : len;
 }
@@ -190,13 +190,13 @@ static ssize_t namespace_store(struct device *dev,
         struct nd_pfn *nd_pfn = to_nd_pfn_safe(dev);
         ssize_t rc;
 
-        device_lock(dev);
+        nd_device_lock(dev);
         nvdimm_bus_lock(dev);
         rc = nd_namespace_store(dev, &nd_pfn->ndns, buf, len);
         dev_dbg(dev, "result: %zd wrote: %s%s", rc, buf,
                         buf[len - 1] == '\n' ? "" : "\n");
         nvdimm_bus_unlock(dev);
-        device_unlock(dev);
+        nd_device_unlock(dev);
 
         return rc;
 }
@@ -208,7 +208,7 @@ static ssize_t resource_show(struct device *dev,
         struct nd_pfn *nd_pfn = to_nd_pfn_safe(dev);
         ssize_t rc;
 
-        device_lock(dev);
+        nd_device_lock(dev);
         if (dev->driver) {
                 struct nd_pfn_sb *pfn_sb = nd_pfn->pfn_sb;
                 u64 offset = __le64_to_cpu(pfn_sb->dataoff);
@@ -222,7 +222,7 @@ static ssize_t resource_show(struct device *dev,
                 /* no address to convey if the pfn instance is disabled */
                 rc = -ENXIO;
         }
-        device_unlock(dev);
+        nd_device_unlock(dev);
 
         return rc;
 }
@@ -234,7 +234,7 @@ static ssize_t size_show(struct device *dev,
         struct nd_pfn *nd_pfn = to_nd_pfn_safe(dev);
         ssize_t rc;
 
-        device_lock(dev);
+        nd_device_lock(dev);
         if (dev->driver) {
                 struct nd_pfn_sb *pfn_sb = nd_pfn->pfn_sb;
                 u64 offset = __le64_to_cpu(pfn_sb->dataoff);
@@ -250,7 +250,7 @@ static ssize_t size_show(struct device *dev,
                 /* no size to convey if the pfn instance is disabled */
                 rc = -ENXIO;
         }
-        device_unlock(dev);
+        nd_device_unlock(dev);
 
         return rc;
 }