lkml.org 
[lkml]   [2020]   [Aug]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 4/4] libnvdimm: avoid unnecessary judgments in nvdimm_namespace_disk_name()
Date
suffix ? suffix : "" appears three times, it's easy to get rid of it
by initialize the local variable "suffix" to empty string.

To avoid having rows that exceed 80 columns, add a new local variable
"region_id".

No functional change, but it can reduce the code size.
Before:
text data bss dec hex filename
41749 3697 16 45462 b196 drivers/nvdimm/namespace_devs.o

After:
text data bss dec hex filename
41653 3697 16 45366 b136 drivers/nvdimm/namespace_devs.o

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

diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c
index 6da67f4d641a27c..ef2800c5da4c99c 100644
--- a/drivers/nvdimm/namespace_devs.c
+++ b/drivers/nvdimm/namespace_devs.c
@@ -157,7 +157,8 @@ const char *nvdimm_namespace_disk_name(struct nd_namespace_common *ndns,
char *name)
{
struct nd_region *nd_region = to_nd_region(ndns->dev.parent);
- const char *suffix = NULL;
+ const char *suffix = "";
+ int region_id = nd_region->id;

if (ndns->claim && is_nd_btt(ndns->claim))
suffix = "s";
@@ -173,17 +174,14 @@ const char *nvdimm_namespace_disk_name(struct nd_namespace_common *ndns,
}

if (nsidx)
- sprintf(name, "pmem%d.%d%s", nd_region->id, nsidx,
- suffix ? suffix : "");
+ sprintf(name, "pmem%d.%d%s", region_id, nsidx, suffix);
else
- sprintf(name, "pmem%d%s", nd_region->id,
- suffix ? suffix : "");
+ sprintf(name, "pmem%d%s", region_id, suffix);
} else if (is_namespace_blk(&ndns->dev)) {
struct nd_namespace_blk *nsblk;

nsblk = to_nd_namespace_blk(&ndns->dev);
- sprintf(name, "ndblk%d.%d%s", nd_region->id, nsblk->id,
- suffix ? suffix : "");
+ sprintf(name, "ndblk%d.%d%s", region_id, nsblk->id, suffix);
} else {
return NULL;
}
--
1.8.3

\
 
 \ /
  Last update: 2020-08-20 16:32    [W:0.863 / U:0.072 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site