From: Zhen Lei <thunder.leizhen@huawei.com>
To: Oliver O'Halloran <oohall@gmail.com>,
Dan Williams <dan.j.williams@intel.com>,
Vishal Verma <vishal.l.verma@intel.com>,
"Dave Jiang" <dave.jiang@intel.com>,
Ira Weiny <ira.weiny@intel.com>,
Markus Elfring <Markus.Elfring@web.de>,
linux-nvdimm <linux-nvdimm@lists.01.org>,
linux-kernel <linux-kernel@vger.kernel.org>
Cc: Zhen Lei <thunder.leizhen@huawei.com>
Subject: [PATCH v3 3/7] libnvdimm: simplify walk_to_nvdimm_bus()
Date: Thu, 20 Aug 2020 10:16:37 +0800 [thread overview]
Message-ID: <20200820021641.3188-4-thunder.leizhen@huawei.com> (raw)
In-Reply-To: <20200820021641.3188-1-thunder.leizhen@huawei.com>
Return as soon as nvdimm_bus device has been found, make us no need to
check "dev" or "!dev" in subsequent code.
No functional change.
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
---
drivers/nvdimm/bus.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/nvdimm/bus.c b/drivers/nvdimm/bus.c
index 955265656b96c73..1d89114cb6ab93e 100644
--- a/drivers/nvdimm/bus.c
+++ b/drivers/nvdimm/bus.c
@@ -316,10 +316,9 @@ struct nvdimm_bus *walk_to_nvdimm_bus(struct device *nd_dev)
for (dev = nd_dev; dev; dev = dev->parent)
if (is_nvdimm_bus(dev))
- break;
- dev_WARN_ONCE(nd_dev, !dev, "invalid dev, not on nd bus\n");
- if (dev)
- return to_nvdimm_bus(dev);
+ return to_nvdimm_bus(dev);
+
+ dev_WARN_ONCE(nd_dev, 1, "invalid dev, not on nd bus\n");
return NULL;
}
--
1.8.3
_______________________________________________
Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org
To unsubscribe send an email to linux-nvdimm-leave@lists.01.org
WARNING: multiple messages have this Message-ID (diff)
From: Zhen Lei <thunder.leizhen@huawei.com>
To: Oliver O'Halloran <oohall@gmail.com>,
Dan Williams <dan.j.williams@intel.com>,
Vishal Verma <vishal.l.verma@intel.com>,
"Dave Jiang" <dave.jiang@intel.com>,
Ira Weiny <ira.weiny@intel.com>,
Markus Elfring <Markus.Elfring@web.de>,
linux-nvdimm <linux-nvdimm@lists.01.org>,
linux-kernel <linux-kernel@vger.kernel.org>
Cc: Zhen Lei <thunder.leizhen@huawei.com>
Subject: [PATCH v3 3/7] libnvdimm: simplify walk_to_nvdimm_bus()
Date: Thu, 20 Aug 2020 10:16:37 +0800 [thread overview]
Message-ID: <20200820021641.3188-4-thunder.leizhen@huawei.com> (raw)
In-Reply-To: <20200820021641.3188-1-thunder.leizhen@huawei.com>
Return as soon as nvdimm_bus device has been found, make us no need to
check "dev" or "!dev" in subsequent code.
No functional change.
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
---
drivers/nvdimm/bus.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/nvdimm/bus.c b/drivers/nvdimm/bus.c
index 955265656b96c73..1d89114cb6ab93e 100644
--- a/drivers/nvdimm/bus.c
+++ b/drivers/nvdimm/bus.c
@@ -316,10 +316,9 @@ struct nvdimm_bus *walk_to_nvdimm_bus(struct device *nd_dev)
for (dev = nd_dev; dev; dev = dev->parent)
if (is_nvdimm_bus(dev))
- break;
- dev_WARN_ONCE(nd_dev, !dev, "invalid dev, not on nd bus\n");
- if (dev)
- return to_nvdimm_bus(dev);
+ return to_nvdimm_bus(dev);
+
+ dev_WARN_ONCE(nd_dev, 1, "invalid dev, not on nd bus\n");
return NULL;
}
--
1.8.3
next prev parent reply other threads:[~2020-08-20 2:17 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-20 2:16 [PATCH v3 0/7] bugfix and optimize for drivers/nvdimm Zhen Lei
2020-08-20 2:16 ` Zhen Lei
2020-08-20 2:16 ` [PATCH v3 1/7] libnvdimm: fix memory leaks in of_pmem.c Zhen Lei
2020-08-20 2:16 ` Zhen Lei
2020-08-20 2:16 ` [PATCH v3 2/7] libnvdimm: add sanity check for provider_name in of_pmem_region_probe() Zhen Lei
2020-08-20 2:16 ` Zhen Lei
2020-08-20 2:16 ` Zhen Lei [this message]
2020-08-20 2:16 ` [PATCH v3 3/7] libnvdimm: simplify walk_to_nvdimm_bus() Zhen Lei
2020-08-20 2:16 ` [PATCH v3 4/7] libnvdimm: reduce an unnecessary if branch in nd_region_create() Zhen Lei
2020-08-20 2:16 ` Zhen Lei
2020-08-20 2:16 ` [PATCH v3 5/7] libnvdimm: reduce an unnecessary if branch in nd_region_activate() Zhen Lei
2020-08-20 2:16 ` Zhen Lei
2020-08-27 7:04 ` Leizhen (ThunderTown)
2020-08-27 7:04 ` Leizhen (ThunderTown)
2020-08-20 2:16 ` [PATCH v3 6/7] libnvdimm: make sure EXPORT_SYMBOL_GPL(nvdimm_flush) close to its function Zhen Lei
2020-08-20 2:16 ` Zhen Lei
2020-08-20 11:05 ` Pankaj Gupta
2020-08-20 11:05 ` Pankaj Gupta
2020-08-20 2:16 ` [PATCH v3 7/7] libnvdimm: slightly simplify available_slots_show() Zhen Lei
2020-08-20 2:16 ` Zhen Lei
2020-08-21 12:56 ` Salih Agenter
2020-08-27 6:35 ` [PATCH v3 0/7] bugfix and optimize for drivers/nvdimm Leizhen (ThunderTown)
2020-08-27 6:35 ` Leizhen (ThunderTown)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200820021641.3188-4-thunder.leizhen@huawei.com \
--to=thunder.leizhen@huawei.com \
--cc=Markus.Elfring@web.de \
--cc=dan.j.williams@intel.com \
--cc=dave.jiang@intel.com \
--cc=ira.weiny@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvdimm@lists.01.org \
--cc=oohall@gmail.com \
--cc=vishal.l.verma@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.