| Message ID | 1604720323-3586-1-git-send-email-wangqing@vivo.com |
|---|---|
| State | Changes Requested |
| Delegated to: | David Miller |
| Headers | show |
| Series | [V2] net/ethernet: update ret when ptp_clock is ERROR | expand |
| Context | Check | Description |
|---|---|---|
| jkicinski/cover_letter | success | Link |
| jkicinski/fixes_present | success | Link |
| jkicinski/patch_count | success | Link |
| jkicinski/tree_selection | success | Guessed tree name to be net-next |
| jkicinski/subject_prefix | warning | Target tree name not specified in the subject |
| jkicinski/source_inline | success | Was 0 now: 0 |
| jkicinski/verify_signedoff | success | Link |
| jkicinski/module_param | success | Was 0 now: 0 |
| jkicinski/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| jkicinski/kdoc | success | Errors and warnings before: 2 this patch: 2 |
| jkicinski/verify_fixes | success | Link |
| jkicinski/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 13 lines checked |
| jkicinski/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| jkicinski/header_inline | success | Link |
| jkicinski/stable | success | Stable not CCed |
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 >
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 > >
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);
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(-)