|
@@ -1379,21 +1379,16 @@ struct nd_namespace_common *nvdimm_namespace_common_probe(struct device *dev)
|
|
|
{
|
|
|
struct nd_btt *nd_btt = is_nd_btt(dev) ? to_nd_btt(dev) : NULL;
|
|
|
struct nd_pfn *nd_pfn = is_nd_pfn(dev) ? to_nd_pfn(dev) : NULL;
|
|
|
- struct nd_namespace_common *ndns;
|
|
|
+ struct nd_namespace_common *ndns = NULL;
|
|
|
resource_size_t size;
|
|
|
|
|
|
if (nd_btt || nd_pfn) {
|
|
|
- struct device *host = NULL;
|
|
|
-
|
|
|
- if (nd_btt) {
|
|
|
- host = &nd_btt->dev;
|
|
|
+ if (nd_btt)
|
|
|
ndns = nd_btt->ndns;
|
|
|
- } else if (nd_pfn) {
|
|
|
- host = &nd_pfn->dev;
|
|
|
+ else if (nd_pfn)
|
|
|
ndns = nd_pfn->ndns;
|
|
|
- }
|
|
|
|
|
|
- if (!ndns || !host)
|
|
|
+ if (!ndns)
|
|
|
return ERR_PTR(-ENODEV);
|
|
|
|
|
|
/*
|
|
@@ -1404,12 +1399,12 @@ struct nd_namespace_common *nvdimm_namespace_common_probe(struct device *dev)
|
|
|
device_unlock(&ndns->dev);
|
|
|
if (ndns->dev.driver) {
|
|
|
dev_dbg(&ndns->dev, "is active, can't bind %s\n",
|
|
|
- dev_name(host));
|
|
|
+ dev_name(dev));
|
|
|
return ERR_PTR(-EBUSY);
|
|
|
}
|
|
|
- if (dev_WARN_ONCE(&ndns->dev, ndns->claim != host,
|
|
|
+ if (dev_WARN_ONCE(&ndns->dev, ndns->claim != dev,
|
|
|
"host (%s) vs claim (%s) mismatch\n",
|
|
|
- dev_name(host),
|
|
|
+ dev_name(dev),
|
|
|
dev_name(ndns->claim)))
|
|
|
return ERR_PTR(-ENXIO);
|
|
|
} else {
|