libnvdimm: cleanup nvdimm_namespace_common_probe(), kill 'host'

Orabug: 22913653

The 'host' variable can be killed as it is always the same as the passed
in device.

Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
(cherry picked from commit 0bfb8dd3edd6e423b5053c86e10c97e92cf205ea)
Signed-off-by: Dan Duval <dan.duval@oracle.com>

diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c
index 8ebfcaae3f5a06a4aca19611fc7c5abdeb29f16a..0d2dc9b94df71d3c4ff6f95c5c309ad4091a14b5 100644 (file)
--- a/drivers/nvdimm/namespace_devs.c
+++ b/drivers/nvdimm/namespace_devs.c
@@ -1370,21 +1370,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);
 
                /*
@@ -1395,12 +1390,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 {