Skip to contentSkip to conversation

nvdimm/namespace: return uuid_null only once in nd_dev_to_uuid()

PATCH In review Andy Shevchenko 2 participants 4 messages Jun 7, 2022 – Jul 14, 2022 libnvdimm: non-volatile memory device

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nvdimm/namespace: return uuid_null only once in nd_dev_to_uuid()

Refactor nd_dev_to_uuid() in order to make code shorter and cleaner by joining conditions and hence returning uuid_null only once.

---
 drivers/nvdimm/namespace_devs.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/nvdimm/namespace_devs.c +3 -6
index bf4f5c09d9b1..3dae17c90e8c 100644
@@ -170,15 +170,12 @@ EXPORT_SYMBOL(nvdimm_namespace_disk_name);
 
 const uuid_t *nd_dev_to_uuid(struct device *dev)
 {
-	if (!dev)
-		return &uuid_null;
-
-	if (is_namespace_pmem(dev)) {
+	if (dev && is_namespace_pmem(dev)) {
 		struct nd_namespace_pmem *nspm = to_nd_namespace_pmem(dev);
 
 		return nspm->uuid;
-	} else
-		return &uuid_null;
+	}
+	return &uuid_null;
 }
 EXPORT_SYMBOL(nd_dev_to_uuid);
 
Signature · 1 line
2.35.1
#1 lore raw
Quoted 2 lines · Andy Shevchenko

Refactor nd_dev_to_uuid() in order to make code shorter and cleaner by joining conditions and hence returning uuid_null only once.

Apologies for the delay, applied for v5.20.

#2 lore raw
Quoted 5 lines · Dan Williams
Quoted 2 lines · Andy Shevchenko

Refactor nd_dev_to_uuid() in order to make code shorter and cleaner by joining conditions and hence returning uuid_null only once.

Apologies for the delay, applied for v5.20.

No problem and thanks!

P.S. One patch out of three is a fix, would be nice to have it in v5.19 release.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#3 lore raw
Quoted 11 lines · Andy Shevchenko
Quoted 5 lines · Dan Williams
Quoted 2 lines · Andy Shevchenko

Refactor nd_dev_to_uuid() in order to make code shorter and cleaner by joining conditions and hence returning uuid_null only once.

Apologies for the delay, applied for v5.20.

No problem and thanks!

P.S. One patch out of three is a fix, would be nice to have it in v5.19 release.

Found it, applied it.