From: Anson Huang <anson.huang@nxp.com>
To: "rui.zhang@intel.com" <rui.zhang@intel.com>,
"edubezval@gmail.com" <edubezval@gmail.com>,
"daniel.lezcano@linaro.org" <daniel.lezcano@linaro.org>,
"linux-pm@vger.kernel.org" <linux-pm@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"viresh.kumar@linaro.org" <viresh.kumar@linaro.org>,
"l.stach@pengutronix.de" <l.stach@pengutronix.de>
Cc: dl-linux-imx <linux-imx@nxp.com>
Subject: [PATCH V5 2/2] thermal: imx: save one condition block for normal case of nvmem initialization
Date: Wed, 21 Nov 2018 05:49:40 +0000 [thread overview]
Message-ID: <1542779052-29536-2-git-send-email-Anson.Huang@nxp.com> (raw)
In-Reply-To: <1542779052-29536-1-git-send-email-Anson.Huang@nxp.com>
Put return value checks of calling imx_init_from_nvmem_cells()
into one block to save one condition block for normal case.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
---
drivers/thermal/imx_thermal.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c
index c924396..bb6754a 100644
--- a/drivers/thermal/imx_thermal.c
+++ b/drivers/thermal/imx_thermal.c
@@ -742,9 +742,10 @@ static int imx_thermal_probe(struct platform_device *pdev)
if (of_find_property(pdev->dev.of_node, "nvmem-cells", NULL)) {
ret = imx_init_from_nvmem_cells(pdev);
- if (ret == -EPROBE_DEFER)
- return ret;
if (ret) {
+ if (ret == -EPROBE_DEFER)
+ return ret;
+
dev_err(&pdev->dev, "failed to init from nvmem: %d\n",
ret);
return ret;
--
2.7.4
next prev parent reply other threads:[~2018-11-21 5:49 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-21 5:49 [PATCH V5 1/2] thermal: imx: fix for dependency on cpu-freq Anson Huang
2018-11-21 5:49 ` Anson Huang [this message]
2018-11-21 5:53 ` [PATCH V5 2/2] thermal: imx: save one condition block for normal case of nvmem initialization Viresh Kumar
2018-11-21 8:30 ` Daniel Lezcano
2018-12-07 3:11 ` Anson Huang
2018-11-21 5:53 ` [PATCH V5 1/2] thermal: imx: fix for dependency on cpu-freq Viresh Kumar
2018-11-21 8:30 ` Daniel Lezcano
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=1542779052-29536-2-git-send-email-Anson.Huang@nxp.com \
--to=anson.huang@nxp.com \
--cc=daniel.lezcano@linaro.org \
--cc=edubezval@gmail.com \
--cc=l.stach@pengutronix.de \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rui.zhang@intel.com \
--cc=viresh.kumar@linaro.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).