diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2022-06-07 17:25:25 +0200 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2022-07-14 20:23:36 +0200 |
| commit | 36a40c37389c7a1bef3f1024c55c056304acf439 (patch) | |
| tree | 2089d9da3c371f16042893aa302484c8839c12ab /drivers/nvdimm | |
| parent | Linux 5.19-rc6 (diff) | |
| download | linux-36a40c37389c7a1bef3f1024c55c056304acf439.tar.xz linux-36a40c37389c7a1bef3f1024c55c056304acf439.zip | |
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.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20220607152525.33468-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/nvdimm')
| -rw-r--r-- | drivers/nvdimm/namespace_devs.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c index bf4f5c09d9b1..3dae17c90e8c 100644 --- a/drivers/nvdimm/namespace_devs.c +++ b/drivers/nvdimm/namespace_devs.c @@ -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); |