|
@@ -1921,7 +1921,7 @@ static struct device *create_namespace_pmem(struct nd_region *nd_region,
|
|
|
}
|
|
|
|
|
|
if (i < nd_region->ndr_mappings) {
|
|
|
- struct nvdimm_drvdata *ndd = to_ndd(&nd_region->mapping[i]);
|
|
|
+ struct nvdimm *nvdimm = nd_region->mapping[i].nvdimm;
|
|
|
|
|
|
/*
|
|
|
* Give up if we don't find an instance of a uuid at each
|
|
@@ -1929,7 +1929,7 @@ static struct device *create_namespace_pmem(struct nd_region *nd_region,
|
|
|
* find a dimm with two instances of the same uuid.
|
|
|
*/
|
|
|
dev_err(&nd_region->dev, "%s missing label for %pUb\n",
|
|
|
- dev_name(ndd->dev), nd_label->uuid);
|
|
|
+ nvdimm_name(nvdimm), nd_label->uuid);
|
|
|
rc = -EINVAL;
|
|
|
goto err;
|
|
|
}
|