From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Fri, 12 Feb 2021 17:10:42 +0000 (+0100)
Subject: libnvdimm/dimm: Simplify nvdimm_remove()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8409f942a1f8c28296910b7b1d60f27dd3e03162;p=linux.git

libnvdimm/dimm: Simplify nvdimm_remove()

nvdimm_remove is only ever called after nvdimm_probe() returned
successfully. In this case driver data is always set to a non-NULL value
so the check for driver data being NULL can go away as it's always false.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20210212171043.2136580-1-u.kleine-koenig@pengutronix.de
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---

diff --git a/drivers/nvdimm/dimm.c b/drivers/nvdimm/dimm.c
index 7d4ddc4d93227..94be3ae1d29f8 100644
--- a/drivers/nvdimm/dimm.c
+++ b/drivers/nvdimm/dimm.c
@@ -117,9 +117,6 @@ static int nvdimm_remove(struct device *dev)
 {
 	struct nvdimm_drvdata *ndd = dev_get_drvdata(dev);
 
-	if (!ndd)
-		return 0;
-
 	nvdimm_bus_lock(dev);
 	dev_set_drvdata(dev, NULL);
 	nvdimm_bus_unlock(dev);