* [V2] [PATCH] net/ethernet: update ret when ptp_clock is ERROR
@ 2020-11-07 3:38 Wang Qing
2020-11-07 14:58 ` Richard Cochran
0 siblings, 1 reply; 3+ messages in thread
From: Wang Qing @ 2020-11-07 3:38 UTC (permalink / raw)
To: David S. Miller, Jakub Kicinski, Grygorii Strashko,
Kurt Kanzenbach, Samuel Zou, Murali Karicheri, Ivan Khoronzhuk,
Wang Qing, netdev, linux-kernel
We always have to update the value of ret, otherwise the error value
may be the previous one. And ptp_clock_register() never return NULL
when PTP_1588_CLOCK enable, so we use IS_ERR here.
Signed-off-by: Wang Qing <wangqing@vivo.com>
---
drivers/net/ethernet/ti/am65-cpts.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/ti/am65-cpts.c b/drivers/net/ethernet/ti/am65-cpts.c
index 75056c1..ec8e56d
--- a/drivers/net/ethernet/ti/am65-cpts.c
+++ b/drivers/net/ethernet/ti/am65-cpts.c
@@ -998,11 +998,10 @@ struct am65_cpts *am65_cpts_create(struct device *dev, void __iomem *regs,
am65_cpts_settime(cpts, ktime_to_ns(ktime_get_real()));
cpts->ptp_clock = ptp_clock_register(&cpts->ptp_info, cpts->dev);
- if (IS_ERR_OR_NULL(cpts->ptp_clock)) {
+ if (IS_ERR(cpts->ptp_clock)) {
dev_err(dev, "Failed to register ptp clk %ld\n",
PTR_ERR(cpts->ptp_clock));
- if (!cpts->ptp_clock)
- ret = -ENODEV;
+ ret = PTR_ERR(cpts->ptp_clock);
goto refclk_disable;
}
cpts->phc_index = ptp_clock_index(cpts->ptp_clock);
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [V2] [PATCH] net/ethernet: update ret when ptp_clock is ERROR
2020-11-07 3:38 [V2] [PATCH] net/ethernet: update ret when ptp_clock is ERROR Wang Qing
@ 2020-11-07 14:58 ` Richard Cochran
2020-11-07 17:36 ` Jakub Kicinski
0 siblings, 1 reply; 3+ messages in thread
From: Richard Cochran @ 2020-11-07 14:58 UTC (permalink / raw)
To: Wang Qing
Cc: David S. Miller, Jakub Kicinski, Grygorii Strashko,
Kurt Kanzenbach, Samuel Zou, Murali Karicheri, Ivan Khoronzhuk,
netdev, linux-kernel
On Sat, Nov 07, 2020 at 11:38:38AM +0800, Wang Qing wrote:
> We always have to update the value of ret, otherwise the error value
> may be the previous one. And ptp_clock_register() never return NULL
> when PTP_1588_CLOCK enable, so we use IS_ERR here.
>
> Signed-off-by: Wang Qing <wangqing@vivo.com>
> ---
> drivers/net/ethernet/ti/am65-cpts.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/ti/am65-cpts.c b/drivers/net/ethernet/ti/am65-cpts.c
> index 75056c1..ec8e56d
> --- a/drivers/net/ethernet/ti/am65-cpts.c
> +++ b/drivers/net/ethernet/ti/am65-cpts.c
> @@ -998,11 +998,10 @@ struct am65_cpts *am65_cpts_create(struct device *dev, void __iomem *regs,
> am65_cpts_settime(cpts, ktime_to_ns(ktime_get_real()));
>
> cpts->ptp_clock = ptp_clock_register(&cpts->ptp_info, cpts->dev);
> - if (IS_ERR_OR_NULL(cpts->ptp_clock)) {
This test was correct.
> + if (IS_ERR(cpts->ptp_clock)) {
This one is wrong.
Thanks,
Richard
> dev_err(dev, "Failed to register ptp clk %ld\n",
> PTR_ERR(cpts->ptp_clock));
> - if (!cpts->ptp_clock)
> - ret = -ENODEV;
> + ret = PTR_ERR(cpts->ptp_clock);
> goto refclk_disable;
> }
> cpts->phc_index = ptp_clock_index(cpts->ptp_clock);
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [V2] [PATCH] net/ethernet: update ret when ptp_clock is ERROR
2020-11-07 14:58 ` Richard Cochran
@ 2020-11-07 17:36 ` Jakub Kicinski
0 siblings, 0 replies; 3+ messages in thread
From: Jakub Kicinski @ 2020-11-07 17:36 UTC (permalink / raw)
To: Richard Cochran
Cc: Wang Qing, David S. Miller, Grygorii Strashko, Kurt Kanzenbach,
Samuel Zou, Murali Karicheri, Ivan Khoronzhuk, netdev,
linux-kernel
On Sat, 7 Nov 2020 06:58:16 -0800 Richard Cochran wrote:
> On Sat, Nov 07, 2020 at 11:38:38AM +0800, Wang Qing wrote:
> > We always have to update the value of ret, otherwise the error value
> > may be the previous one. And ptp_clock_register() never return NULL
> > when PTP_1588_CLOCK enable, so we use IS_ERR here.
> >
> > Signed-off-by: Wang Qing <wangqing@vivo.com>
Wang Qing please send a v3. Please add an appropriate Fixes tag, since
this is a fix, and put [PATCH net] in the subject instead of just
[PATCH] to clarify that you expect the patch to be applied to the
net tree.
> > diff --git a/drivers/net/ethernet/ti/am65-cpts.c b/drivers/net/ethernet/ti/am65-cpts.c
> > index 75056c1..ec8e56d
> > --- a/drivers/net/ethernet/ti/am65-cpts.c
> > +++ b/drivers/net/ethernet/ti/am65-cpts.c
> > @@ -998,11 +998,10 @@ struct am65_cpts *am65_cpts_create(struct device *dev, void __iomem *regs,
> > am65_cpts_settime(cpts, ktime_to_ns(ktime_get_real()));
> >
> > cpts->ptp_clock = ptp_clock_register(&cpts->ptp_info, cpts->dev);
> > - if (IS_ERR_OR_NULL(cpts->ptp_clock)) {
>
> This test was correct.
>
> > + if (IS_ERR(cpts->ptp_clock)) {
>
> This one is wrong.
Please fix this as Richard requests.
> > dev_err(dev, "Failed to register ptp clk %ld\n",
> > PTR_ERR(cpts->ptp_clock));
> > - if (!cpts->ptp_clock)
> > - ret = -ENODEV;
> > + ret = PTR_ERR(cpts->ptp_clock);
But keep this part as is, because your code from v1 looks like it
wouldn't even build.
Thank you!
> > goto refclk_disable;
> > }
> > cpts->phc_index = ptp_clock_index(cpts->ptp_clock);
> > --
> > 2.7.4
> >
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-11-07 17:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-07 3:38 [V2] [PATCH] net/ethernet: update ret when ptp_clock is ERROR Wang Qing
2020-11-07 14:58 ` Richard Cochran
2020-11-07 17:36 ` Jakub Kicinski
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).