| Message ID | 1542779052-29536-2-git-send-email-Anson.Huang@nxp.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Eduardo Valentin |
| Headers | show |
| Series | [V5,1/2] thermal: imx: fix for dependency on cpu-freq | expand |
On 21-11-18, 05:49, Anson Huang wrote: > 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; Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
On 21/11/2018 06:49, Anson Huang wrote: > 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> Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org> > --- > 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; >
Gentle ping.. Best Regards! Anson Huang > -----Original Message----- > From: Daniel Lezcano [mailto:daniel.lezcano@linaro.org] > Sent: 2018年11月21日 16:31 > To: Anson Huang <anson.huang@nxp.com>; rui.zhang@intel.com; > edubezval@gmail.com; linux-pm@vger.kernel.org; > linux-kernel@vger.kernel.org; viresh.kumar@linaro.org; > l.stach@pengutronix.de > Cc: dl-linux-imx <linux-imx@nxp.com> > Subject: Re: [PATCH V5 2/2] thermal: imx: save one condition block for normal > case of nvmem initialization > > On 21/11/2018 06:49, Anson Huang wrote: > > 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> > > Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org> > > > --- > > 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; > > > > > -- > > <https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww > .linaro.org%2F&data=02%7C01%7Canson.huang%40nxp.com%7Cfd6043 > 7ee3644bef859308d64f8babfc%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C > 0%7C0%7C636783858654973865&sdata=BgscGAsKYemJsPxOeWnhK9o7 > 2DnyV%2B5p%2B%2F2FukhcpqM%3D&reserved=0> Linaro.org │ Open > source software for ARM SoCs > > Follow Linaro: > <https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww > .facebook.com%2Fpages%2FLinaro&data=02%7C01%7Canson.huang%40 > nxp.com%7Cfd60437ee3644bef859308d64f8babfc%7C686ea1d3bc2b4c6fa92 > cd99c5c301635%7C0%7C0%7C636783858654973865&sdata=6zA10lW > wnWoAUK7jqqvsDDMM2Q13AedmeSPABMeR%2Bxc%3D&reserved=0> > Facebook | > <https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Ftwitt > er.com%2F%23!%2Flinaroorg&data=02%7C01%7Canson.huang%40nxp.c > om%7Cfd60437ee3644bef859308d64f8babfc%7C686ea1d3bc2b4c6fa92cd99 > c5c301635%7C0%7C0%7C636783858654973865&sdata=kuquKEUuvXW > 88V2QgPQgXYBgv2Htv37GKDqah0VeIJ8%3D&reserved=0> Twitter | > <https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww > .linaro.org%2Flinaro-blog%2F&data=02%7C01%7Canson.huang%40nxp.c > om%7Cfd60437ee3644bef859308d64f8babfc%7C686ea1d3bc2b4c6fa92cd99 > c5c301635%7C0%7C0%7C636783858654973865&sdata=0AiYcj1H1va1n > mee2tHWWYnmGe5wzFoao4KZbkxsKzo%3D&reserved=0> Blog
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;
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(-)