Merge branch 'afs-dh' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-block.git] / drivers / nvdimm / dax_devs.c

diff --git a/drivers/nvdimm/dax_devs.c b/drivers/nvdimm/dax_devs.c
index 1bf2bd318371e967fd401c6d6777834d53adcdac..0453f49dc70814f35d2e0988f46304777f3e2559 100644 (file)
--- a/drivers/nvdimm/dax_devs.c
+++ b/drivers/nvdimm/dax_devs.c
@@ -24,7 +24,7 @@ static void nd_dax_release(struct device *dev)
        struct nd_dax *nd_dax = to_nd_dax(dev);
        struct nd_pfn *nd_pfn = &nd_dax->nd_pfn;
 
-       dev_dbg(dev, "%s\n", __func__);
+       dev_dbg(dev, "trace\n");
        nd_detach_ndns(dev, &nd_pfn->ndns);
        ida_simple_remove(&nd_region->dax_ida, nd_pfn->id);
        kfree(nd_pfn->uuid);
@@ -129,8 +129,7 @@ int nd_dax_probe(struct device *dev, struct nd_namespace_common *ndns)
        pfn_sb = devm_kzalloc(dev, sizeof(*pfn_sb), GFP_KERNEL);
        nd_pfn->pfn_sb = pfn_sb;
        rc = nd_pfn_validate(nd_pfn, DAX_SIG);
-       dev_dbg(dev, "%s: dax: %s\n", __func__,
-                       rc == 0 ? dev_name(dax_dev) : "<none>");
+       dev_dbg(dev, "dax: %s\n", rc == 0 ? dev_name(dax_dev) : "<none>");
        if (rc < 0) {
                nd_detach_ndns(dax_dev, &nd_pfn->ndns);
                put_device(dax_dev);