[PATCH v3 4/7] libnvdimm: reduce an unnecessary if branch in nd_region_create()

Zhen Lei
2020-08-20T02:17:36Z

if (ndr_desc->flush)
1) nd_region->flush = ndr_desc->flush;
else
2) nd_region->flush = NULL;

When entering the "else" branch, the value of ndr_desc->flush is NULL.
After replaced "NULL" with "ndr_desc->flush" at 2), we will find that
it becomes the same to 1).

So the above code snippet can be reduced to one statement:
nd_region->flush = ndr_desc->flush;

No functional change.

Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
---
drivers/nvdimm/region_devs.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/nvdimm/region_devs.c b/drivers/nvdimm/region_devs.c
index ef23119db574663..7cf9c7d857909ce 100644
--- a/drivers/nvdimm/region_devs.c
+++ b/drivers/nvdimm/region_devs.c
@@ -1131,10 +1131,7 @@ static struct nd_region *nd_region_create(struct nvdimm_bus *nvdimm_bus,
nd_region->ndr_size = resource_size(ndr_desc->res);
nd_region->ndr_start = ndr_desc->res->start;
nd_region->align = default_align(nd_region);
- if (ndr_desc->flush)
- nd_region->flush = ndr_desc->flush;
- else
- nd_region->flush = NULL;
+ nd_region->flush = ndr_desc->flush;

nd_device_register(dev);